@primmel/primmel 1.4.0 → 1.4.1

package/dist-browser/index.mjs

@@ -466,6 +466,7 @@ function ie(e, t, o) {
 		enumRef: "",
 		pattern: "",
 		required: !1,
+		requiredWhen: "",
 		measurementMethod: "",
 		calculationId: null,
 		calculationBindings: [],
@@ -506,7 +507,10 @@ function ie(e, t, o) {
 		else if (e === "examples") s.examples = a(c[l++]);
 		else if (e === "bind") s.bind = a(c[l++]);
 		else if (e === "required") s.required = a(c[l++]) === "true";
-		else if (e === "measurement_method") s.measurementMethod = a(c[l++]);
+		else if (e === "required_when") {
+			let e = w(c, l);
+			s.requiredWhen = a(e.text), l = e.next;
+		} else if (e === "measurement_method") s.measurementMethod = a(c[l++]);
 		else if (e === "calculation") {
 			let e = w(c, l);
 			s.calculationId = a(e.text), l = e.next;
@@ -660,7 +664,7 @@ function le(e, t) {
 		}
 		t.applicability.length > 0 && (n += "applicability { " + j(t.applicability) + "} "), r.push(n + "}");
 	}
-	if (e.label && r.push("label \"" + s(e.label) + "\""), e.definition && r.push("definition \"" + s(e.definition) + "\""), e.description && r.push("description \"" + s(e.description) + "\""), e.unit && r.push("unit \"" + s(e.unit) + "\""), e.symbol && r.push("symbol " + e.symbol), e.verdict && r.push("verdict " + e.verdict), e.dimension && r.push("dimension " + e.dimension), e.enumRef && r.push("enum " + e.enumRef), e.pattern && r.push("pattern \"" + s(e.pattern) + "\""), e.scope && r.push("scope " + e.scope), e.examples && r.push("examples \"" + s(e.examples) + "\""), e.required && r.push("required true"), e.measurementMethod && r.push("measurement_method " + e.measurementMethod), e.calculationId && r.push("calculation " + T(e.calculationId)), e.calculationBindings.length > 0 && r.push("calculation_bindings { " + e.calculationBindings.map((e) => e.inputName + ": " + e.pathExpr).join(" ") + "}"), e.derivation && r.push("derivation \"" + s(e.derivation) + "\""), e.evaluation) {
+	if (e.label && r.push("label \"" + s(e.label) + "\""), e.definition && r.push("definition \"" + s(e.definition) + "\""), e.description && r.push("description \"" + s(e.description) + "\""), e.unit && r.push("unit \"" + s(e.unit) + "\""), e.symbol && r.push("symbol " + e.symbol), e.verdict && r.push("verdict " + e.verdict), e.dimension && r.push("dimension " + e.dimension), e.enumRef && r.push("enum " + e.enumRef), e.pattern && r.push("pattern \"" + s(e.pattern) + "\""), e.scope && r.push("scope " + e.scope), e.examples && r.push("examples \"" + s(e.examples) + "\""), e.required && r.push("required true"), e.requiredWhen && r.push("required_when " + T(e.requiredWhen)), e.measurementMethod && r.push("measurement_method " + e.measurementMethod), e.calculationId && r.push("calculation " + T(e.calculationId)), e.calculationBindings.length > 0 && r.push("calculation_bindings { " + e.calculationBindings.map((e) => e.inputName + ": " + e.pathExpr).join(" ") + "}"), e.derivation && r.push("derivation \"" + s(e.derivation) + "\""), e.evaluation) {
 		let t = "evaluation { rule \"" + s(e.evaluation.rule) + "\"";
 		e.evaluation.verdict && (t += " verdict " + e.evaluation.verdict), e.evaluation.op && (t += " op " + e.evaluation.op), e.evaluation.limit && (t += " limit \"" + s(e.evaluation.limit) + "\""), e.evaluation.condition && (t += " condition \"" + s(e.evaluation.condition) + "\""), e.evaluation.referenceId && (t += " reference { " + e.evaluation.referenceId + " }"), e.evaluation.specificationReference && (t += " specification_reference \"" + s(e.evaluation.specificationReference) + "\""), e.evaluation.sourceDiscrepancy && (t += " " + C(e.evaluation.sourceDiscrepancy, "")), r.push(t + " }");
 	}
@@ -2396,6 +2400,7 @@ function hn(e, t) {
 		enumRef: "",
 		pattern: "",
 		required: !1,
+		requiredWhen: "",
 		measurementMethod: "",
 		calculationId: null,
 		calculationBindings: [],
@@ -3295,15 +3300,15 @@ function Zn(e) {
 	}
 	return t;
 }
-function L(e) {
+function Qn(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 Qn(e) {
-	let t = L(e);
-	return e.columns && (t += "columns { ", t += e.columns.ac ? "ac { " + L(e.columns.ac) + "} " : "ac null ", t += e.columns.dc ? "dc { " + L(e.columns.dc) + "} " : "dc null ", t += e.columns.vehicleDc ? "vehicle_dc { " + L(e.columns.vehicleDc) + "} " : "vehicle_dc null ", t += "} "), t;
+function $n(e) {
+	let t = Qn(e);
+	return e.columns && (t += "columns { ", t += e.columns.ac ? "ac { " + Qn(e.columns.ac) + "} " : "ac null ", t += e.columns.dc ? "dc { " + Qn(e.columns.dc) + "} " : "dc null ", t += e.columns.vehicleDc ? "vehicle_dc { " + Qn(e.columns.vehicleDc) + "} " : "vehicle_dc null ", t += "} "), t;
 }
-function $n(e, t) {
+function er(e, t) {
 	let n = t + "design {\n";
 	if (e.counts.length > 0) {
 		n += t + "  counts {\n";
@@ -3318,7 +3323,7 @@ function $n(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 ? "{ " + Qn(n) + "}" : "null") + " ";
+			for (let [t, n] of Object.entries(r.envClassValues)) e += "env " + t + " " + (n ? "{ " + $n(n) + "}" : "null") + " ";
 			n += e + "}\n";
 		}
 		n += t + "  }\n";
@@ -3364,11 +3369,11 @@ function $n(e, t) {
 }
 //#endregion
 //#region src/ser-des/config/competenceKind.ts
-function er(e) {
+function tr(e) {
 	let t = a(e);
 	return t.trim() !== "" && !isNaN(Number(t)) ? Number(t) : t;
 }
-function tr(e) {
+function nr(e) {
 	let t = {
 		value: 0,
 		unit: ""
@@ -3380,7 +3385,7 @@ function tr(e) {
 	}
 	return t;
 }
-function nr(e) {
+function rr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "competence") {
@@ -3409,37 +3414,37 @@ function nr(e) {
 					for (; c < r.length;) {
 						let e = r[c++];
 						if (c >= r.length) break;
-						e === "min" ? o.min = er(r[c++]) : e === "max" ? o.max = er(r[c++]) : e === "unit" ? o.unit = a(r[c++]) : i(r[c++]);
+						e === "min" ? o.min = tr(r[c++]) : e === "max" ? o.max = tr(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 = tr(i(t[s++])) : r === "stability" ? e.stability = tr(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 = nr(i(t[s++])) : r === "stability" ? e.stability = nr(i(t[s++])) : r === "description" ? e.description = a(t[s++]) : i(t[s++]);
 			}
 		}
 		t.push(e);
 	}
 	return t;
 }
-function rr(e, t) {
+function ir(e, t) {
 	return t ? "      " + e + " { value " + String(t.value) + " unit \"" + s(t.unit) + "\" }\n" : "";
 }
-function ir(e) {
+function ar(e) {
 	return e === null ? "" : typeof e == "number" ? String(e) : "\"" + s(e) + "\"";
 }
-function ar(e) {
+function or(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 " + ir(n.range.min)), n.range.max !== null && (e += " max " + ir(n.range.max)), e += " unit \"" + s(n.range.unit) + "\" }\n", t += e;
+			n.range.min !== null && (e += " min " + ar(n.range.min)), n.range.max !== null && (e += " max " + ar(n.range.max)), e += " unit \"" + s(n.range.unit) + "\" }\n", t += e;
 		}
-		n.methodStandard && (t += "      method_standard \"" + s(n.methodStandard) + "\"\n"), t += rr("resolution", n.resolution), t += rr("stability", n.stability), n.description && (t += "      description \"" + s(n.description) + "\"\n"), t += "    }\n";
+		n.methodStandard && (t += "      method_standard \"" + s(n.methodStandard) + "\"\n"), t += ir("resolution", n.resolution), t += ir("stability", n.stability), n.description && (t += "      description \"" + s(n.description) + "\"\n"), t += "    }\n";
 	}
 	return t += "  }\n", t;
 }
-function or(e) {
+function sr(e) {
 	return e.length >= 2 && e.charAt(0) === "\"" && e.charAt(e.length - 1) === "\"" ? o(e.substr(1, e.length - 2)) : i(e);
 }
-var sr = function(e, t) {
+var cr = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -3450,20 +3455,20 @@ var sr = 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 = or(o[s++]);
-		else if (t === "definition") n.definition = or(o[s++]);
+		if (t === "label") n.label = sr(o[s++]);
+		else if (t === "definition") n.definition = sr(o[s++]);
 		else if (t === "source") n.source = k(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: or(o[s++])
+				title: sr(o[s++])
 			});
 		} else s++;
 	}
 	return (t) => (t.competenceKinds[e] = n, t);
-}, cr = function(e) {
+}, lr = 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";
@@ -3471,13 +3476,13 @@ var sr = function(e, t) {
 };
 //#endregion
 //#region src/ser-des/config/conformanceTest.ts
-function R(e) {
+function L(e) {
 	return n(a(e)).map(E).map(a).filter((e) => e.length > 0);
 }
-function lr(e) {
+function ur(e) {
 	return e.trim() !== "" && !isNaN(Number(e)) ? Number(e) : e;
 }
-function ur(e) {
+function dr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "variable") {
@@ -3523,7 +3528,7 @@ function ur(e) {
 	}
 	return t;
 }
-function dr(e) {
+function fr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "precondition") {
@@ -3548,7 +3553,7 @@ function dr(e) {
 	}
 	return t;
 }
-function fr(e) {
+function pr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "observable") {
@@ -3573,7 +3578,7 @@ function fr(e) {
 	}
 	return t;
 }
-function pr(e, t) {
+function mr(e, t) {
 	let r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
@@ -3630,7 +3635,7 @@ function pr(e, t) {
 		t.acceptanceCriteria.push(c);
 	}
 }
-function mr(e) {
+function hr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "value") {
@@ -3653,7 +3658,7 @@ function mr(e) {
 	}
 	return t;
 }
-function hr(e) {
+function gr(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = E(r[i++]);
@@ -3662,7 +3667,7 @@ function hr(e) {
 	}
 	return t;
 }
-function gr(e) {
+function _r(e) {
 	let t = {
 		by: "",
 		values: {}
@@ -3681,7 +3686,7 @@ function gr(e) {
 					for (; l < o.length;) {
 						let e = E(o[l++]);
 						if (l >= o.length) break;
-						o[l] === ":" && l++, l < o.length && (c[e] = lr(a(o[l++])));
+						o[l] === ":" && l++, l < o.length && (c[e] = ur(a(o[l++])));
 					}
 					t.values[r] = c;
 				}
@@ -3690,7 +3695,7 @@ function gr(e) {
 	}
 	return t;
 }
-var _r = function(e, t) {
+var vr = function(e, t) {
 	let o = {
 		id: e,
 		name: "",
@@ -3758,30 +3763,30 @@ var _r = function(e, t) {
 						action: v(() => e[n + 1]),
 						outputs: []
 					};
-					n += 2, e[n] === "inputs" && n + 1 < e.length && (r.inputs = R(e[n + 1]), n += 2), e[n] === "outputs" && n + 1 < e.length && (r.outputs = R(e[n + 1]), n += 2), o.procedure.push(r);
+					n += 2, e[n] === "inputs" && n + 1 < e.length && (r.inputs = L(e[n + 1]), n += 2), e[n] === "outputs" && n + 1 < e.length && (r.outputs = L(e[n + 1]), n += 2), o.procedure.push(r);
 				} else n++;
 			}
-		} else if (e === "procedure_steps") o.procedureSteps = R(t());
+		} else if (e === "procedure_steps") o.procedureSteps = L(t());
 		else if (e === "kind") o.kind = a(t());
 		else if (e === "obligation") o.obligation = a(t());
 		else if (e === "obligation_note") o.obligationNote = v(t);
-		else if (e === "test_subject") o.testSubject = hr(i(t()));
-		else if (e === "variables") o.variables = ur(i(t()));
-		else if (e === "observables") o.observables = fr(i(t()));
-		else if (e === "conditions_to_enforce" || e === "conditionsToEnforce") o.conditionsToEnforce = R(t());
-		else if (e === "preconditions") o.preconditions = dr(i(t()));
-		else if (e === "reference_materials") o.referenceMaterials = R(t());
-		else if (e === "required_competence") o.requiredCompetence = nr(i(t()));
-		else if (e === "acceptance_criteria") pr(i(t()), o);
+		else if (e === "test_subject") o.testSubject = gr(i(t()));
+		else if (e === "variables") o.variables = dr(i(t()));
+		else if (e === "observables") o.observables = pr(i(t()));
+		else if (e === "conditions_to_enforce" || e === "conditionsToEnforce") o.conditionsToEnforce = L(t());
+		else if (e === "preconditions") o.preconditions = fr(i(t()));
+		else if (e === "reference_materials") o.referenceMaterials = L(t());
+		else if (e === "required_competence") o.requiredCompetence = rr(i(t()));
+		else if (e === "acceptance_criteria") mr(i(t()), o);
 		else if (e === "design") o.design = Jn(i(t()));
 		else if (e === "acceptance") o.acceptance = zn(i(t()));
-		else if (e === "dependencies") o.dependencies = R(t());
-		else if (e === "instances") o.instances = gr(i(t()));
+		else if (e === "dependencies") o.dependencies = L(t());
+		else if (e === "instances") o.instances = _r(i(t()));
 		else if (e === "inherits_from") o.inheritsFrom = a(t());
-		else if (e === "result_forms") o.resultForms = R(t());
-		else if (e === "produces_artifacts") o.producesArtifacts = R(t());
-		else if (e === "report_rows") o.reportRows = R(t());
-		else if (e === "derived_values") o.derivedValues = mr(i(t()));
+		else if (e === "result_forms") o.resultForms = L(t());
+		else if (e === "produces_artifacts") o.producesArtifacts = L(t());
+		else if (e === "report_rows") o.reportRows = L(t());
+		else if (e === "derived_values") o.derivedValues = hr(i(t()));
 		else if (e === "validate_measurement") {
 			let e = r(t());
 			for (let t of e) t.startsWith("\"") && o.measurements.push(i(t));
@@ -3792,7 +3797,7 @@ var _r = function(e, t) {
 		construct: "conformance_test",
 		id: e
 	}), (t) => (t.conformanceTests[e] = o, t);
-}, vr = function(e) {
+}, yr = 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 += "  reference { doc \"" + s(n.doc) + "\" clause \"" + s(n.clause) + "\"" + (n.fragment ? " fragment \"" + s(n.fragment) + "\"" : "") + " }\n";
 	else e.sourceRef && e.sourceRef.doc ? t += "  reference { doc \"" + s(e.sourceRef.doc) + "\" clause \"" + s(e.sourceRef.clause) + "\"" + (e.sourceRef.fragment ? " fragment \"" + s(e.sourceRef.fragment) + "\"" : "") + " }\n" : e.reference && (t += "  reference " + e.reference + "\n");
@@ -3852,7 +3857,7 @@ var _r = function(e, t) {
 		}
 		t += "  }\n";
 	}
-	if (e.referenceMaterials.length > 0 && (t += "  reference_materials { " + e.referenceMaterials.join(" ") + " }\n"), e.requiredCompetence.length > 0 && (t += ar(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 += or(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 || "\"\"") + " { ";
@@ -3860,7 +3865,7 @@ var _r = function(e, t) {
 		}
 		t += "  }\n";
 	}
-	if (e.design && (t += $n(e.design, "  ")), e.acceptance && (t += Bn(e.acceptance, "  ") + "\n"), e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.instances) {
+	if (e.design && (t += er(e.design, "  ")), e.acceptance && (t += Bn(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 + " { ";
@@ -3875,7 +3880,7 @@ var _r = function(e, t) {
 		t += "  }\n";
 	}
 	return e.sourceDiscrepancy && (t += C(e.sourceDiscrepancy, "  ") + "\n"), t += "}\n", t;
-}, yr = function(e, t) {
+}, br = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -3914,7 +3919,7 @@ var _r = function(e, t) {
 		construct: "term",
 		id: e
 	}), (t) => (t.terms[e] = n, t);
-}, br = function(e) {
+}, xr = 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;
@@ -3924,17 +3929,17 @@ var _r = function(e, t) {
 		t += "  }\n";
 	}
 	return t += "}\n", t;
-}, xr = [
+}, Sr = [
 	"none",
 	"max",
 	"mean",
 	"worst_case",
 	"max_abs_over_window"
 ];
-function Sr(e) {
+function Cr(e) {
 	return n(a(e)).map(E).map(a).filter((e) => e.length > 0);
 }
-var Cr = function(e, t) {
+var wr = function(e, t) {
 	let r = {
 		id: e,
 		quantityKind: "",
@@ -3956,10 +3961,10 @@ var Cr = function(e, t) {
 		} else if (t === "symbol") r.symbol = v(o);
 		else if (t === "behavior") r.behavior = o();
 		else if (t === "derive" || t === "expression") r.derive = v(o);
-		else if (t === "inputs" || t === "uses") r.inputs = Sr(o());
+		else if (t === "inputs" || t === "uses") r.inputs = Cr(o());
 		else if (t === "series_reduction") {
 			let t = o();
-			if (!xr.includes(t)) throw Error(`Parsing error: verdict. ID ${e}: Unknown series_reduction ${t} (valid: ${xr.join(", ")})`);
+			if (!Sr.includes(t)) throw Error(`Parsing error: verdict. ID ${e}: Unknown series_reduction ${t} (valid: ${Sr.join(", ")})`);
 			r.seriesReduction = t;
 		} else if (t === "acceptance") r.acceptance = zn(i(o()));
 		else if (t === "source" || t === "reference") r.source = k(i(o()));
@@ -3969,13 +3974,13 @@ var Cr = function(e, t) {
 		construct: "verdict",
 		id: e
 	}), (t) => (t.verdicts[e] = r, t);
-}, wr = function(e) {
+}, Tr = function(e) {
 	let t = "verdict " + e.id + " {\n";
 	return 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 += Bn(e.acceptance, "  ") + "\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;
 };
 //#endregion
 //#region src/ser-des/config/referenceMaterial.ts
-function Tr(e) {
+function Er(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "field") {
@@ -4001,7 +4006,7 @@ function Tr(e) {
 	}
 	return t;
 }
-function Er(e) {
+function Dr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "constraint") {
@@ -4050,7 +4055,7 @@ function Er(e) {
 	}
 	return t;
 }
-var Dr = function(e, t) {
+var Or = function(e, t) {
 	let n = {
 		id: e,
 		kind: "",
@@ -4065,8 +4070,8 @@ var Dr = function(e, t) {
 		else if (e === "name") n.name = v(t);
 		else if (e === "definition") n.definition = v(t);
 		else if (e === "source") n.source = k(i(t()));
-		else if (e === "identity_fields") n.identityFields = Tr(i(t()));
-		else if (e === "constraints") n.constraints = Er(i(t()));
+		else if (e === "identity_fields") n.identityFields = Er(i(t()));
+		else if (e === "constraints") n.constraints = Dr(i(t()));
 		else return !1;
 		return !0;
 	}, {
@@ -4074,12 +4079,12 @@ var Dr = function(e, t) {
 		id: e
 	}), (t) => (t.referenceMaterials[e] = n, t);
 };
-function Or(e, t) {
+function kr(e, t) {
 	return !e || !e.doc && !e.clause ? "" : t + "source { doc \"" + s(e.doc) + "\" clause \"" + s(e.clause) + "\"" + (e.fragment ? " fragment \"" + s(e.fragment) + "\"" : "") + " }\n";
 }
-var kr = function(e) {
+var Ar = function(e) {
 	let t = "reference_material " + e.id + " {\n";
-	if (e.kind && (t += "  kind " + e.kind + "\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), t += Or(e.source, "  "), e.identityFields.length > 0) {
+	if (e.kind && (t += "  kind " + e.kind + "\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), t += kr(e.source, "  "), e.identityFields.length > 0) {
 		t += "  identity_fields {\n";
 		for (let n of e.identityFields) {
 			let e = "    field " + n.name + " { ";
@@ -4092,7 +4097,7 @@ var kr = function(e) {
 		for (let n of e.constraints) {
 			t += "    constraint " + n.id + " {\n", n.description && (t += "      description \"" + s(n.description) + "\"\n"), n.rule && (t += "      rule \"" + s(n.rule) + "\"\n");
 			let e = Object.keys(n.evidence);
-			e.length > 0 && (t += "      evidence { " + e.map((e) => e + ": " + n.evidence[e]).join(" ") + " }\n"), n.override && (t += "      override { rule \"" + s(n.override.rule) + "\"", t += " by " + n.override.by, n.override.evidence && (t += " evidence " + n.override.evidence), t += " }\n"), n.onViolation && (t += "      on_violation " + n.onViolation + "\n"), t += Or(n.source, "      "), t += "    }\n";
+			e.length > 0 && (t += "      evidence { " + e.map((e) => e + ": " + n.evidence[e]).join(" ") + " }\n"), n.override && (t += "      override { rule \"" + s(n.override.rule) + "\"", t += " by " + n.override.by, n.override.evidence && (t += " evidence " + n.override.evidence), t += " }\n"), n.onViolation && (t += "      on_violation " + n.onViolation + "\n"), t += kr(n.source, "      "), t += "    }\n";
 		}
 		t += "  }\n";
 	}
@@ -4100,10 +4105,10 @@ var kr = function(e) {
 };
 //#endregion
 //#region src/ser-des/config/constraint.ts
-function Ar(e) {
+function jr(e) {
 	return e.length >= 2 && e.charAt(0) === "\"" && e.charAt(e.length - 1) === "\"" ? o(e.substr(1, e.length - 2)) : i(e);
 }
-var jr = function(e, t) {
+var Mr = function(e, t) {
 	let n = {
 		id: e,
 		stereotype: "",
@@ -4116,13 +4121,13 @@ var jr = function(e, t) {
 	for (; s < o.length;) {
 		let t = o[s++];
 		if (s >= o.length) throw Error(`Parsing error: constraint. ID ${e}: Expecting value for ${t}`);
-		t === "stereotype" ? n.stereotype = a(o[s++]) : t === "name" ? n.name = Ar(o[s++]) : t === "check" ? n.check = Ar(o[s++]) : t === "violation_meaning" ? n.violationMeaning = Ar(o[s++]) : t === "on_violation" ? n.onViolation = a(o[s++]) : t === "source" ? n.source = k(i(o[s++])) : s++;
+		t === "stereotype" ? n.stereotype = a(o[s++]) : t === "name" ? n.name = jr(o[s++]) : t === "check" ? n.check = jr(o[s++]) : t === "violation_meaning" ? n.violationMeaning = jr(o[s++]) : t === "on_violation" ? n.onViolation = a(o[s++]) : t === "source" ? n.source = k(i(o[s++])) : s++;
 	}
 	return (t) => (t.constraints[e] = n, t);
-}, Mr = function(e) {
+}, Nr = 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;
-}, Nr = ["open", "resolved"], Pr = function(e, t) {
+}, Pr = ["open", "resolved"], Fr = function(e, t) {
 	let i = {
 		id: e,
 		status: "",
@@ -4137,7 +4142,7 @@ var jr = 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 (!Nr.includes(t)) throw Error(`Parsing error: discrepancy_record. ID ${e}: Unknown status ${t} (valid: ${Nr.join(", ")})`);
+			if (!Pr.includes(t)) throw Error(`Parsing error: discrepancy_record. ID ${e}: Unknown status ${t} (valid: ${Pr.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);
@@ -4148,13 +4153,13 @@ var jr = 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);
-}, Fr = function(e) {
+}, Ir = 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 Ir(e) {
+function Lr(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = E(r[o++]);
@@ -4174,7 +4179,7 @@ function Ir(e) {
 	}
 	return t;
 }
-function Lr(e) {
+function Rr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "point") {
@@ -4199,7 +4204,7 @@ function Lr(e) {
 	}
 	return t;
 }
-var Rr = function(e, t) {
+var zr = function(e, t) {
 	let n = {
 		id: e,
 		description: "",
@@ -4211,16 +4216,16 @@ var Rr = function(e, t) {
 	return g(t, (e, t) => {
 		if (e === "description") n.description = v(t);
 		else if (e === "source") n.source = k(i(t()));
-		else if (e === "cardinality") n.cardinality = Ir(i(t()));
+		else if (e === "cardinality") n.cardinality = Lr(i(t()));
 		else if (e === "repetitions_per_point") n.repetitionsPerPoint = Number(a(t()));
-		else if (e === "points") n.points = Lr(i(t()));
+		else if (e === "points") n.points = Rr(i(t()));
 		else return !1;
 		return !0;
 	}, {
 		construct: "test_point_set",
 		id: e
 	}), (t) => (t.testPointSets[e] = n, t);
-}, zr = function(e) {
+}, Br = function(e) {
 	let t = "test_point_set " + e.id + " {\n";
 	e.description && (t += "  description \"" + s(e.description) + "\"\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");
 	let n = Object.keys(e.cardinality);
@@ -4244,10 +4249,10 @@ var Rr = function(e, t) {
 };
 //#endregion
 //#region src/ser-des/config/requirement.ts
-function z(e) {
+function R(e) {
 	return n(a(e)).map(E).map(a).filter((e) => e.length > 0);
 }
-function Br(e) {
+function Vr(e) {
 	let t = {
 		verdict: "",
 		op: "",
@@ -4261,7 +4266,7 @@ function Br(e) {
 	}
 	return t;
 }
-function Vr(e) {
+function Hr(e) {
 	let t = {
 		expression: "",
 		uses: [],
@@ -4275,11 +4280,11 @@ function Vr(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 = z(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 = Br(i(r[o++])) : e === "acceptance" ? t.acceptance = zn(i(r[o++])) : e === "source_discrepancy" ? t.sourceDiscrepancy = S(i(r[o++])) : i(r[o++]);
+		e === "expression" ? t.expression = a(r[o++]) : e === "uses" ? t.uses = R(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 = Vr(i(r[o++])) : e === "acceptance" ? t.acceptance = zn(i(r[o++])) : e === "source_discrepancy" ? t.sourceDiscrepancy = S(i(r[o++])) : i(r[o++]);
 	}
 	return t;
 }
-function Hr(e) {
+function Ur(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "subject") {
@@ -4303,7 +4308,7 @@ function Hr(e) {
 	}
 	return t;
 }
-function Ur(e) {
+function Wr(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		if (r[o++] !== "param") {
@@ -4337,14 +4342,14 @@ function Ur(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 = z(t[s++]) : i(t[s++]);
+				} else r === "enum_values" ? e.enumValues = R(t[s++]) : i(t[s++]);
 			}
 		}
 		t.push(e);
 	}
 	return t;
 }
-var Wr = function(e, t) {
+var Gr = function(e, t) {
 	let o = {
 		id: e,
 		name: "",
@@ -4370,10 +4375,10 @@ var Wr = 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 = z(s[c++]);
-		else if (e === "subjects") o.subjects = Hr(i(s[c++]));
-		else if (e === "parameters") o.parameters = Ur(i(s[c++]));
-		else if (e === "limit") o.limit = Vr(i(s[c++]));
+		else if (e === "binds_to") o.bindsTo = R(s[c++]);
+		else if (e === "subjects") o.subjects = Ur(i(s[c++]));
+		else if (e === "parameters") o.parameters = Wr(i(s[c++]));
+		else if (e === "limit") o.limit = Hr(i(s[c++]));
 		else if (e === "applicability") o.applicability = A(i(s[c++]));
 		else if (e === "channel") o.channel = a(s[c++]);
 		else if (e === "report_row") o.reportRow = a(s[c++]);
@@ -4386,7 +4391,7 @@ var Wr = 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 = z(s[c++]);
+		} else if (e === "dependencies") o.dependencies = R(s[c++]);
 		else if (e === "source_discrepancy") o.sourceDiscrepancy = S(i(s[c++]));
 		else if (e === "source" || e === "reference") {
 			let e = k(i(s[c++]));
@@ -4395,7 +4400,7 @@ var Wr = function(e, t) {
 	}
 	return (t) => (t.requirements[e] = o, t);
 };
-function Gr(e) {
+function Kr(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;
@@ -4403,7 +4408,7 @@ function Gr(e) {
 	}
 	return e.acceptance && (t += Bn(e.acceptance, "    ") + "\n"), e.sourceDiscrepancy && (t += C(e.sourceDiscrepancy, "    ") + "\n"), t += "  }\n", t;
 }
-var Kr = 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 { ";
@@ -4418,14 +4423,14 @@ var Kr = function(e) {
 		}
 		t += "  }\n";
 	}
-	if (e.limit && (t += Gr(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + j(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 += Kr(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + j(e.applicability).trim() + "\n  }\n"), e.channel && (t += "  channel " + e.channel + "\n"), e.reportRow && (t += "  report_row " + e.reportRow + "\n"), e.obligation && (t += "  obligation " + e.obligation + "\n"), e.acceptanceCriteria && (t += "  acceptance_criteria {\n    " + e.acceptanceCriteria + "\n  }\n"), e.verificationMethod) {
 		let n = "  verification { method " + e.verificationMethod;
 		e.verificationDescription && (n += " description \"" + s(e.verificationDescription) + "\""), t += n + " }\n";
 	}
 	e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.sourceDiscrepancy && (t += C(e.sourceDiscrepancy, "  ") + "\n");
 	for (let n of e.sourceRefs ?? (e.source && (e.source.doc || e.source.clause) ? [e.source] : [])) t += "  source { doc \"" + s(n.doc) + "\" clause \"" + s(n.clause) + "\"" + (n.fragment ? " fragment \"" + s(n.fragment) + "\"" : "") + " }\n";
 	return t += "}\n", t;
-}, qr = function(e, t) {
+}, Jr = function(e, t) {
 	let n = {
 		id: e,
 		name: "",
@@ -4437,46 +4442,46 @@ var Kr = 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 = A(i(o[s++])) : e === "dependencies" ? n.dependencies = z(o[s++]) : e === "reference" ? n.referenceIds = z(o[s++]) : i(o[s++]);
+		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 = A(i(o[s++])) : e === "dependencies" ? n.dependencies = R(o[s++]) : e === "reference" ? n.referenceIds = R(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.requirementClasses[e] = n, t);
-}, Jr = function(e) {
+}, Yr = 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    " + j(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;
-}, Yr = {
+}, Xr = {
 	keyword: "requirement",
 	field: "requirements",
 	takesID: !0,
-	parse: Wr,
-	dump: Kr
-}, Xr = {
+	parse: Gr,
+	dump: qr
+}, Zr = {
 	keyword: "requirement_class",
 	field: "requirementClasses",
 	takesID: !0,
-	parse: qr,
-	dump: Jr
+	parse: Jr,
+	dump: Yr
 };
 //#endregion
 //#region src/ser-des/config/packageManifest.ts
-function B(e) {
+function z(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-var Zr = [
+var Qr = [
 	"core",
 	"module",
 	"rec",
 	"product_reference",
 	"certification_program"
-], Qr = [
+], $r = [
 	"current",
 	"preview",
 	"superseded",
 	"withdrawn"
 ];
-function $r(e) {
-	return e.startsWith("{") ? B(e) : [a(e)];
+function ei(e) {
+	return e.startsWith("{") ? z(e) : [a(e)];
 }
-var ei = function(e) {
+var ti = function(e) {
 	let t = {
 		id: "",
 		title: "",
@@ -4495,12 +4500,12 @@ var ei = 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 = B(r[o++]);
+		else if (e === "editions") t.editions = z(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 B(r[o++])) {
+			for (let t of z(r[o++])) {
 				let r = t.indexOf("@");
 				if (r === -1) {
 					e.push(t);
@@ -4513,17 +4518,17 @@ var ei = function(e) {
 			t.uses = e, Object.keys(n).length > 0 && (t.usePins = n);
 		} else if (e === "kind") {
 			let e = a(r[o++]);
-			if (!Zr.includes(e)) throw Error(`Parsing error: package: Expected kind ${Zr.join("|")}, got "${e}"`);
+			if (!Qr.includes(e)) throw Error(`Parsing error: package: Expected kind ${Qr.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 = B(r[o++]);
+		else if (e === "maps_to" || e === "mapsTo") t.mapsTo = z(r[o++]);
 		else if (e === "scheme_type" || e === "schemeType") t.schemeType = a(r[o++]);
-		else if (e === "provides") t.provides = B(r[o++]);
-		else if (e === "requires") t.requires = B(r[o++]);
-		else if (e === "waives") t.waives = B(r[o++]);
-		else if (e === "supersedes") t.supersedes = $r(r[o++]);
-		else if (e === "replaces") t.replaces = $r(r[o++]);
+		else if (e === "provides") t.provides = z(r[o++]);
+		else if (e === "requires") t.requires = z(r[o++]);
+		else if (e === "waives") t.waives = z(r[o++]);
+		else if (e === "supersedes") t.supersedes = ei(r[o++]);
+		else if (e === "replaces") t.replaces = ei(r[o++]);
 		else if (e === "validity") {
 			let e = n(i(r[o++])), s = { from: "" }, c = 0;
 			for (; c < e.length;) {
@@ -4534,10 +4539,10 @@ var ei = function(e) {
 			t.validity = s;
 		} else if (e === "status") {
 			let e = a(r[o++]);
-			if (!Qr.includes(e)) throw Error(`Parsing error: package: Expected status ${Qr.join("|")}, got "${e}"`);
+			if (!$r.includes(e)) throw Error(`Parsing error: package: Expected status ${$r.join("|")}, got "${e}"`);
 			t.status = e;
 		} else if (e === "default_spelling" || e === "defaultSpelling") t.defaultSpelling = a(r[o++]);
-		else if (e === "spellings") t.spellings = B(r[o++]);
+		else if (e === "spellings") t.spellings = z(r[o++]);
 		else if (e === "description") t.description = a(r[o++]);
 		else if (e === "source") {
 			let e = {
@@ -4547,18 +4552,18 @@ var ei = 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 = B(s[c++]) : i(s[c++]);
+				t === "collection" ? e.collection = a(s[c++]) : t === "parts" ? e.parts = z(s[c++]) : i(s[c++]);
 			}
 			t.source = e;
 		} else i(r[o++]);
 	}
 	return (e) => (e.packageManifest = t, e);
 };
-function ti(e) {
+function ni(e) {
 	let t = "package {\n";
 	return 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"), 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 ni = {
+var ri = {
 	keyword: "conformance_class",
 	field: "conformanceClasses",
 	takesID: !0,
@@ -4578,7 +4583,7 @@ var ni = {
 		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 = A(i(s[c++])) : e === "test_subject" ? o.testSubject = hr(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) : i(s[c++]);
+			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 = A(i(s[c++])) : e === "test_subject" ? o.testSubject = gr(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) : i(s[c++]);
 		}
 		return (t) => (t.conformanceClasses[e] = o, t);
 	},
@@ -4591,24 +4596,24 @@ var ni = {
 		}
 		return e.dependencies.length > 0 && (t += "  dependencies { " + e.dependencies.join(" ") + " }\n"), e.referenceIds.length > 0 && (t += "  reference { " + e.referenceIds.join(" ") + " }\n"), t += "}\n", t;
 	}
-}, ri = [
+}, ii = [
 	"public",
 	"registered",
 	"authority"
-], ii = /* @__PURE__ */ new Set([
+], ai = /* @__PURE__ */ new Set([
 	"kind",
 	"serves",
 	"does",
 	"payload"
 ]);
-function ai(e, t) {
+function oi(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 && !ii.has(e[s]) && !e[s].startsWith("{");) {
+	for (; s < e.length && !ai.has(e[s]) && !e[s].startsWith("{");) {
 		for (let t of e[s].split(",")) {
 			let e = a(t.trim());
 			e && o.push(e);
@@ -4620,7 +4625,7 @@ function ai(e, t) {
 		next: s
 	};
 }
-function oi(e, t) {
+function si(e, t) {
 	let r = {
 		name: e,
 		kind: "",
@@ -4633,10 +4638,10 @@ function oi(e, t) {
 		if (s > o.length) break;
 		if (e === "kind") r.kind = a(o[s++] ?? "");
 		else if (e === "serves") {
-			let e = ai(o, s);
+			let e = oi(o, s);
 			r.serves = e.names, s = e.next;
 		} else if (e === "does") {
-			let e = ai(o, s);
+			let e = oi(o, s);
 			r.does = e.names, s = e.next;
 		} else if (e === "payload") {
 			let e = n(i(o[s++] ?? "")), t = {
@@ -4654,7 +4659,7 @@ function oi(e, t) {
 	}
 	return r;
 }
-function si(e) {
+function ci(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = E(r[o++]);
@@ -4666,7 +4671,7 @@ function si(e) {
 	}
 	return t;
 }
-function ci(e, t) {
+function li(e, t) {
 	let r = {
 		id: e,
 		operations: [],
@@ -4678,19 +4683,19 @@ function ci(e, t) {
 		if (s > o.length) break;
 		if (e === "operation") {
 			let e = E(o[s++] ?? ""), t = s < o.length ? i(o[s++]) : "";
-			e && r.operations.push(oi(e, t));
-		} else e === "access" ? r.access = si(i(o[s++] ?? "")) : e === "profile" ? r.profile = a(o[s++] ?? "") : i(o[s++] ?? "");
+			e && r.operations.push(si(e, t));
+		} else e === "access" ? r.access = ci(i(o[s++] ?? "")) : e === "profile" ? r.profile = a(o[s++] ?? "") : i(o[s++] ?? "");
 	}
 	return r;
 }
-function li(e, t) {
+function ui(e, t) {
 	let n = t + "operation " + T(e.name) + " {";
 	return e.kind && (n += " kind " + T(e.kind)), e.serves.length > 0 && (n += " serves { " + e.serves.map(T).join(" ") + " }"), e.does.length > 0 && (n += " does { " + e.does.map(T).join(" ") + " }"), e.payload && (n += " payload { quantity_kind " + T(e.payload.quantityKind) + " unit " + T(e.payload.unit) + " timestamp " + (e.payload.timestamp ? "true" : "false") + " }"), n + " }\n";
 }
-function ui(e, t) {
+function di(e, t) {
 	let n = t + "endpoint " + T(e.id) + " {\n";
-	for (let r of e.operations) n += li(r, t + "  ");
-	let r = ri.filter((t) => (e.access[t] ?? []).length > 0), i = Object.keys(e.access).filter((e) => !ri.includes(e));
+	for (let r of e.operations) n += ui(r, t + "  ");
+	let r = ii.filter((t) => (e.access[t] ?? []).length > 0), i = Object.keys(e.access).filter((e) => !ii.includes(e));
 	if (r.length + i.length > 0) {
 		n += t + "  access {";
 		for (let t of [...r, ...i]) n += " " + t + " { " + (e.access[t] ?? []).map(T).join(" ") + " }";
@@ -4698,7 +4703,7 @@ function ui(e, t) {
 	}
 	return e.profile && (n += t + "  profile " + T(e.profile) + "\n"), n + t + "}\n";
 }
-function di(e, t) {
+function fi(e, t) {
 	let r = {
 		aspect: "",
 		via: "",
@@ -4717,11 +4722,11 @@ function di(e, t) {
 		next: t
 	};
 }
-function fi(e, t) {
+function pi(e, t) {
 	let n = t + "serve " + T(e.aspect) + " via " + T(e.via);
 	return e.freshWithin && (n += " { fresh_within " + T(e.freshWithin) + " }"), n + "\n";
 }
-var pi = {
+var mi = {
 	keyword: "connector_profile",
 	field: "connectorProfiles",
 	takesID: !0,
@@ -4746,7 +4751,7 @@ var pi = {
 };
 //#endregion
 //#region src/ser-des/config/composition.ts
-function mi(e, t) {
+function hi(e, t) {
 	let r = {
 		id: e,
 		product: "",
@@ -4766,7 +4771,7 @@ function mi(e, t) {
 	}
 	return r;
 }
-function hi(e) {
+function gi(e) {
 	let t = [];
 	for (let n of e.split("\n")) {
 		let e = n.trim();
@@ -4789,7 +4794,7 @@ function hi(e) {
 	}
 	return t;
 }
-function gi(e) {
+function _i(e) {
 	let t = {
 		components: [],
 		decomposition: []
@@ -4798,8 +4803,8 @@ function gi(e) {
 		let e = n[a++];
 		if (e === "component") {
 			let e = n[a++] ?? "", r = a < n.length ? i(n[a++]) : "";
-			e && t.components.push(mi(e, r));
-		} else if (e === "decomposition") t.decomposition = hi(i(n[a++] ?? ""));
+			e && t.components.push(hi(e, r));
+		} else if (e === "decomposition") t.decomposition = gi(i(n[a++] ?? ""));
 		else if (e === "revision") {
 			let e = Number(n[a++] ?? "");
 			Number.isFinite(e) && (t.revision = e);
@@ -4807,13 +4812,13 @@ function gi(e) {
 	}
 	return t;
 }
-function _i(e, t) {
+function vi(e, t) {
 	let n = t + "component " + T(e.id) + " {\n";
 	return n += t + "  product " + T(e.product) + "\n", n += t + "  endpoint " + T(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 vi(e, t) {
+function yi(e, t) {
 	let n = t + "composed_of {\n";
-	for (let r of e.components) n += _i(r, t + "  ");
+	for (let r of e.components) n += vi(r, t + "  ");
 	if (e.decomposition.length > 0) {
 		n += t + "  decomposition {\n";
 		for (let r of e.decomposition) n += t + "    " + T(r.register) + " -> " + (r.component === "composite" ? "rule " + T(r.rule ?? "") : T(r.component) + "." + T(r.componentRegister ?? "")) + "\n";
@@ -4823,21 +4828,21 @@ function vi(e, t) {
 }
 //#endregion
 //#region src/ser-des/config/subject.ts
-function V(e, t, n) {
+function B(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 H(e) {
+function V(e) {
 	return n(a(e)).map(E).map(a).filter((e) => e.length > 0);
 }
-function U(e, t, n) {
+function H(e, t, n) {
 	return t.length === 0 ? "" : `${n}${e} { ${t.join(" ")} }\n`;
 }
-function W(e) {
+function U(e) {
 	return n(a(e)).map(a).filter((e) => e.length > 0);
 }
-var yi = function(e, t) {
+var bi = function(e, t) {
 	let o = {
 		id: e,
 		extends: "",
@@ -4859,9 +4864,9 @@ var yi = 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 = bi(i(s[c++]));
-		else if (e === "component") o.components.push(xi(a(s[c++]), i(s[c++])));
-		else if (e === "structure") o.structure.push(Si(a(s[c++]), i(s[c++])));
+		else if (e === "measurand") o.measurand = xi(i(s[c++]));
+		else if (e === "component") o.components.push(Si(a(s[c++]), i(s[c++])));
+		else if (e === "structure") o.structure.push(Ci(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") o.source = k(i(s[c++]));
@@ -4876,9 +4881,9 @@ var yi = 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 = k(i(l[u++])) : i(l[u++]);
 			}
 			o.variants.push(r);
-		} else if (e === "dimension") o.dimensions.push(Ci(a(s[c++]), i(s[c++])));
+		} else if (e === "dimension") o.dimensions.push(wi(a(s[c++]), i(s[c++])));
 		else if (e === "per_channel") o.perChannel = a(s[c++]);
-		else if (e === "family_criteria") o.familyCriteria = W(s[c++]);
+		else if (e === "family_criteria") o.familyCriteria = U(s[c++]);
 		else if (e === "family") {
 			let e = n(i(s[c++])), t = 0;
 			for (; t < e.length;) {
@@ -4891,13 +4896,13 @@ var yi = function(e, t) {
 			for (; t < e.length;) {
 				let n = e[t++];
 				if (t >= e.length) break;
-				n === "dimensions" ? o.familyDefaultDimensions = H(e[t++]) : n === "parameters" ? o.familyDefaultParameters = H(e[t++]) : i(e[t++]);
+				n === "dimensions" ? o.familyDefaultDimensions = V(e[t++]) : n === "parameters" ? o.familyDefaultParameters = V(e[t++]) : i(e[t++]);
 			}
-		} else e === "model_group" ? o.modelGroup = Ti(i(s[c++])) : e === "reference" ? o.referenceIds = W(s[c++]) : i(s[c++]);
+		} else e === "model_group" ? o.modelGroup = Ei(i(s[c++])) : e === "reference" ? o.referenceIds = U(s[c++]) : i(s[c++]);
 	}
 	return (t) => (t.instruments[e] = o, t);
 };
-function bi(e) {
+function xi(e) {
 	let t = {
 		kind: "",
 		description: "",
@@ -4924,7 +4929,7 @@ function bi(e) {
 	}
 	return t;
 }
-function xi(e, t) {
+function Si(e, t) {
 	let r = {
 		id: e,
 		classId: "",
@@ -4938,7 +4943,7 @@ function xi(e, t) {
 	}
 	return r;
 }
-function Si(e, t) {
+function Ci(e, t) {
 	let r = {
 		id: e,
 		predicate: "",
@@ -4966,7 +4971,7 @@ function Si(e, t) {
 	}
 	return r;
 }
-function Ci(e, t) {
+function wi(e, t) {
 	let r = {
 		id: e,
 		label: "",
@@ -4986,11 +4991,11 @@ function Ci(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 = k(i(o[s++])) : t === "values" ? r.values = wi(i(o[s++])) : i(o[s++]);
+		} else t === "label_separator" ? r.labelSeparator = a(o[s++]) : t === "description" ? r.description = a(o[s++]) : t === "reference" || t === "source" ? r.source = k(i(o[s++])) : t === "values" ? r.values = Ti(i(o[s++])) : i(o[s++]);
 	}
 	return r;
 }
-function wi(e) {
+function Ti(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = E(r[o++]);
@@ -5009,7 +5014,7 @@ function wi(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 = H(e[t++]);
+				else if (r === "implies") s.implies = V(e[t++]);
 				else if (r === "term_ref") s.termRef = a(e[t++]);
 				else if (r === "payload") {
 					let r = n(i(e[t++])), o = 0;
@@ -5033,7 +5038,7 @@ function wi(e) {
 	}
 	return t;
 }
-function Ti(e) {
+function Ei(e) {
 	let t = {
 		definition: "",
 		identicalCharacteristics: [],
@@ -5044,15 +5049,15 @@ function Ti(e) {
 	for (; o < r.length;) {
 		let e = r[o++];
 		if (o >= r.length) break;
-		e === "definition" ? t.definition = a(r[o++]) : e === "identical_characteristics" ? t.identicalCharacteristics = H(r[o++]) : e === "identical_attributes" ? t.identicalAttributes = H(r[o++]) : e === "group_by" ? t.groupBy = a(r[o++]) : e === "note" ? t.note = a(r[o++]) : e === "source" ? t.sources.push(k(i(r[o++]))) : e === "sample_selection" ? t.sampleSelection.push(k(i(r[o++]))) : i(r[o++]);
+		e === "definition" ? t.definition = a(r[o++]) : e === "identical_characteristics" ? t.identicalCharacteristics = V(r[o++]) : e === "identical_attributes" ? t.identicalAttributes = V(r[o++]) : e === "group_by" ? t.groupBy = a(r[o++]) : e === "note" ? t.note = a(r[o++]) : e === "source" ? t.sources.push(k(i(r[o++]))) : e === "sample_selection" ? t.sampleSelection.push(k(i(r[o++]))) : i(r[o++]);
 	}
 	return t;
 }
-var Ei = function(e) {
+var Di = 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 += V("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 += B("source", n.source, "    "), t += "  }\n";
 	}
 	for (let n of e.components ?? []) {
 		let e = "  component " + n.id + " { ";
@@ -5064,7 +5069,7 @@ var Ei = function(e) {
 			for (let e of n.propagation) t += e.property + " " + e.direction + " ";
 			t += "}\n";
 		}
-		n.note && (t += "    note \"" + s(n.note) + "\"\n"), t += V("source", n.source, "    "), t += "  }\n";
+		n.note && (t += "    note \"" + s(n.note) + "\"\n"), t += B("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) {
@@ -5072,7 +5077,7 @@ var Ei = 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 += V("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 += B("reference", n.source, "    "), n.values.length > 0) {
 			t += "    values {\n";
 			for (let e of n.values) {
 				let n = "      " + e.id;
@@ -5094,19 +5099,19 @@ var Ei = function(e) {
 		}
 		t += "  }\n";
 	}
-	if ((e.familyMetamodelClass || e.familyDefinition || e.familyNote || e.familySource && (e.familySource.doc || e.familySource.clause)) && (t += "  family {\n", e.familyMetamodelClass && (t += "    metamodel_class " + e.familyMetamodelClass + "\n"), e.familyDefinition && (t += "    definition \"" + s(e.familyDefinition) + "\"\n"), e.familyNote && (t += "    note \"" + s(e.familyNote) + "\"\n"), t += V("source", e.familySource ?? null, "    "), t += "  }\n"), e.familyCriteria.length > 0) {
+	if ((e.familyMetamodelClass || e.familyDefinition || e.familyNote || e.familySource && (e.familySource.doc || e.familySource.clause)) && (t += "  family {\n", e.familyMetamodelClass && (t += "    metamodel_class " + e.familyMetamodelClass + "\n"), e.familyDefinition && (t += "    definition \"" + s(e.familyDefinition) + "\"\n"), e.familyNote && (t += "    note \"" + s(e.familyNote) + "\"\n"), t += B("source", e.familySource ?? null, "    "), t += "  }\n"), e.familyCriteria.length > 0) {
 		t += "  family_criteria {\n";
 		for (let n of e.familyCriteria) t += "    \"" + s(n) + "\"\n";
 		t += "  }\n";
 	}
-	if ((e.familyDefaultDimensions.length > 0 || e.familyDefaultParameters.length > 0) && (t += "  family_defaults {\n", t += U("dimensions", e.familyDefaultDimensions, "    "), t += U("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 += U("identical_characteristics", e.modelGroup.identicalCharacteristics, "    "), t += U("identical_attributes", e.modelGroup.identicalAttributes, "    ");
-		for (let n of e.modelGroup.sources ?? []) t += V("source", n, "    ");
-		for (let n of e.modelGroup.sampleSelection ?? []) t += V("sample_selection", n, "    ");
+	if ((e.familyDefaultDimensions.length > 0 || e.familyDefaultParameters.length > 0) && (t += "  family_defaults {\n", t += H("dimensions", e.familyDefaultDimensions, "    "), t += H("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 += H("identical_characteristics", e.modelGroup.identicalCharacteristics, "    "), t += H("identical_attributes", e.modelGroup.identicalAttributes, "    ");
+		for (let n of e.modelGroup.sources ?? []) t += B("source", n, "    ");
+		for (let n of e.modelGroup.sampleSelection ?? []) t += B("sample_selection", n, "    ");
 		t += "  }\n";
 	}
-	return t += V("source", e.source ?? null, "  "), t += U("reference", e.referenceIds, "  "), t += "}\n", t;
-}, Di = function(e, t) {
+	return t += B("source", e.source ?? null, "  "), t += H("reference", e.referenceIds, "  "), t += "}\n", t;
+}, Oi = function(e, t) {
 	let n = {
 		id: e,
 		symbol: "",
@@ -5128,13 +5133,13 @@ var Ei = function(e) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "symbol" ? n.symbol = a(o[s++]) : e === "name" ? n.name = a(o[s++]) : e === "definition" ? n.definition = a(o[s++]) : e === "source" || e === "reference" ? n.source = k(i(o[s++])) : e === "quantity_kind" ? n.quantityKind = a(o[s++]) : e === "unit" ? n.unit = a(o[s++]) : e === "value_type" ? n.valueType = a(o[s++]) : e === "origin" ? n.origin = a(o[s++]) : e === "scope" ? n.scope = a(o[s++]) : e === "category" ? n.category = a(o[s++]) : e === "is_dimension" ? n.isDimension = a(o[s++]) === "true" : e === "enum" ? n.enumRef = a(o[s++]) : e === "enum_values" ? n.enumValues = H(o[s++]) : e === "note" ? n.note = a(o[s++]) : e === "irdi" ? n.irdi = a(o[s++]) : e === "derived" ? n.derived = a(o[s++]) : i(o[s++]);
+		e === "symbol" ? n.symbol = a(o[s++]) : e === "name" ? n.name = a(o[s++]) : e === "definition" ? n.definition = a(o[s++]) : e === "source" || e === "reference" ? n.source = k(i(o[s++])) : e === "quantity_kind" ? n.quantityKind = a(o[s++]) : e === "unit" ? n.unit = a(o[s++]) : e === "value_type" ? n.valueType = a(o[s++]) : e === "origin" ? n.origin = a(o[s++]) : e === "scope" ? n.scope = a(o[s++]) : e === "category" ? n.category = a(o[s++]) : e === "is_dimension" ? n.isDimension = a(o[s++]) === "true" : e === "enum" ? n.enumRef = a(o[s++]) : e === "enum_values" ? n.enumValues = V(o[s++]) : e === "note" ? n.note = a(o[s++]) : e === "irdi" ? n.irdi = a(o[s++]) : e === "derived" ? n.derived = a(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.attributeDefinitions[e] = n, t);
-}, Oi = function(e) {
+}, ki = function(e) {
 	let t = "attribute_definition " + e.id + " {\n";
-	return e.symbol && (t += "  symbol \"" + s(e.symbol) + "\"\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), t += V("source", e.source, "  "), 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;
-}, ki = function(e, t) {
+	return e.symbol && (t += "  symbol \"" + s(e.symbol) + "\"\n"), e.name && (t += "  name \"" + s(e.name) + "\"\n"), e.definition && (t += "  definition \"" + s(e.definition) + "\"\n"), t += B("source", e.source, "  "), 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;
+}, Ai = function(e, t) {
 	let n = {
 		id: e,
 		label: "",
@@ -5150,13 +5155,13 @@ var Ei = function(e) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "label" ? n.label = a(o[s++]) : e === "description" ? n.description = a(o[s++]) : e === "abstract" ? n.abstract = a(o[s++]) === "true" : e === "extends" ? n.extends = H(o[s++]) : e === "requires" ? n.requires = H(o[s++]) : e === "has_parameters" ? n.hasParameters = H(o[s++]) : e === "satisfies_requirements" ? n.satisfiesRequirements = W(o[s++]) : e === "verified_by_tests" || e === "verified_by" ? n.verifiedByTests = W(o[s++]) : e === "reference" ? n.referenceIds = W(o[s++]) : i(o[s++]);
+		e === "label" ? n.label = a(o[s++]) : e === "description" ? n.description = a(o[s++]) : e === "abstract" ? n.abstract = a(o[s++]) === "true" : e === "extends" ? n.extends = V(o[s++]) : e === "requires" ? n.requires = V(o[s++]) : e === "has_parameters" ? n.hasParameters = V(o[s++]) : e === "satisfies_requirements" ? n.satisfiesRequirements = U(o[s++]) : e === "verified_by_tests" || e === "verified_by" ? n.verifiedByTests = U(o[s++]) : e === "reference" ? n.referenceIds = U(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.capabilities[e] = n, t);
-}, Ai = function(e) {
+}, ji = 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 += U("extends", e.extends, "  "), t += U("requires", e.requires, "  "), t += U("has_parameters", e.hasParameters, "  "), t += U("satisfies_requirements", e.satisfiesRequirements, "  "), t += U("verified_by_tests", e.verifiedByTests, "  "), t += U("reference", e.referenceIds, "  "), t += "}\n", t;
-}, ji = 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 += H("extends", e.extends, "  "), t += H("requires", e.requires, "  "), t += H("has_parameters", e.hasParameters, "  "), t += H("satisfies_requirements", e.satisfiesRequirements, "  "), t += H("verified_by_tests", e.verifiedByTests, "  "), t += H("reference", e.referenceIds, "  "), t += "}\n", t;
+}, Mi = function(e, t) {
 	let n = {
 		id: e,
 		kind: "",
@@ -5169,13 +5174,13 @@ var Ei = function(e) {
 	for (; s < o.length;) {
 		let e = o[s++];
 		if (s >= o.length) break;
-		e === "kind" ? n.kind = a(o[s++]) : e === "stimulus" ? n.stimulus = a(o[s++]) : e === "response" ? n.response = a(o[s++]) : e === "source" || e === "reference" ? n.source = k(i(o[s++])) : e === "verified_by" || e === "verified_by_tests" ? n.verifiedBy = W(o[s++]) : i(o[s++]);
+		e === "kind" ? n.kind = a(o[s++]) : e === "stimulus" ? n.stimulus = a(o[s++]) : e === "response" ? n.response = a(o[s++]) : e === "source" || e === "reference" ? n.source = k(i(o[s++])) : e === "verified_by" || e === "verified_by_tests" ? n.verifiedBy = U(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.behaviors[e] = n, t);
-}, Mi = function(e) {
+}, Ni = function(e) {
 	let t = "behavior " + e.id + " {\n";
-	return e.kind && (t += "  kind " + e.kind + "\n"), e.stimulus && (t += "  stimulus " + e.stimulus + "\n"), e.response && (t += "  response \"" + s(e.response) + "\"\n"), t += V("source", e.source, "  "), t += U("verified_by", e.verifiedBy, "  "), t += "}\n", t;
-}, Ni = function(e, t) {
+	return e.kind && (t += "  kind " + e.kind + "\n"), e.stimulus && (t += "  stimulus " + e.stimulus + "\n"), e.response && (t += "  response \"" + s(e.response) + "\"\n"), t += B("source", e.source, "  "), t += H("verified_by", e.verifiedBy, "  "), t += "}\n", t;
+}, Pi = function(e, t) {
 	let n = {
 		id: e,
 		role: "",
@@ -5190,15 +5195,15 @@ var Ei = 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 = Pi(i(o[s++]));
+		else if (e === "entries") n.entries = Fi(i(o[s++]));
 		else if (e === "source") {
 			let e = k(i(o[s++]));
 			n.sources.push(e), n.source ||= e;
-		} else e === "reference" ? n.referenceIds = W(o[s++]) : i(o[s++]);
+		} else e === "reference" ? n.referenceIds = U(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.conditionSets[e] = n, t);
 };
-function Pi(e) {
+function Fi(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = E(r[o++]);
@@ -5221,7 +5226,7 @@ function Pi(e) {
 	}
 	return t;
 }
-var Fi = function(e) {
+var Ii = 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";
@@ -5232,10 +5237,10 @@ var Fi = function(e) {
 		t += "  }\n";
 	}
 	let n = e.sources && e.sources.length > 0 ? e.sources : e.source ? [e.source] : [];
-	for (let e of n) t += V("source", e, "  ");
-	return t += U("reference", e.referenceIds, "  "), t += "}\n", t;
+	for (let e of n) t += B("source", e, "  ");
+	return t += H("reference", e.referenceIds, "  "), t += "}\n", t;
 };
-function Ii(e) {
+function Li(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = E(r[i++]);
@@ -5244,7 +5249,7 @@ function Ii(e) {
 	}
 	return t;
 }
-function Li(e) {
+function Ri(e) {
 	let t = {}, r = n(e), i = 0;
 	for (; i < r.length;) {
 		let e = E(r[i++]);
@@ -5256,10 +5261,10 @@ function Li(e) {
 	}
 	return t;
 }
-function G(e) {
+function W(e) {
 	return n(e).map(a).filter((e) => e.length > 0);
 }
-function Ri(e) {
+function zi(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = E(r[o++]);
@@ -5271,13 +5276,13 @@ function Ri(e) {
 	}
 	return t;
 }
-function zi(e) {
+function Bi(e) {
 	let t = {}, r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = E(r[o++]);
 		if (!e) break;
 		if (o < r.length && r[o].startsWith("{")) {
-			t[e] = Bi(i(r[o++]));
+			t[e] = Vi(i(r[o++]));
 			continue;
 		}
 		let n = "", s = "", c = !1;
@@ -5293,7 +5298,7 @@ function zi(e) {
 	}
 	return t;
 }
-function Bi(e) {
+function Vi(e) {
 	let t = {
 		symbol: "",
 		derivation: ""
@@ -5309,18 +5314,18 @@ function Bi(e) {
 	}
 	return t;
 }
-var Vi = /* @__PURE__ */ new Set(["state", "behavior"]);
-function Hi(e, t, n) {
+var Hi = /* @__PURE__ */ new Set(["state", "behavior"]);
+function Ui(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 Ui(e, t, n, r, i) {
+function Wi(e, t, n, r, i) {
 	let a = E(n);
 	return e.misplacedAspects.push({
 		family: t,
 		aspect: a
-	}), i < r.length && r[i].startsWith("{") || Vi.has(a) ? i++ : i = Hi(a, r, i), i;
+	}), i < r.length && r[i].startsWith("{") || Hi.has(a) ? i++ : i = Ui(a, r, i), i;
 }
-function Wi(e, t) {
+function Gi(e, t) {
 	let r = e[t] ?? "";
 	if (r === "symbolic") return {
 		level: {
@@ -5349,7 +5354,7 @@ function Wi(e, t) {
 		next: t + 1
 	};
 }
-function Gi(e) {
+function Ki(e) {
 	let t = [], r = n(e), o = 0;
 	for (; o < r.length;) {
 		let e = r[o++];
@@ -5380,64 +5385,64 @@ function Gi(e) {
 			if (l >= c.length) break;
 			if (e === "target") s.target = a(c[l++]);
 			else if (e === "level") {
-				let e = Wi(c, l);
+				let e = Gi(c, l);
 				s.level = e.level, l = e.next;
 			} else if (e === "conditions") {
 				let e = w(c, l);
 				s.conditions = a(e.text), l = e.next;
-			} else e === "statement" ? s.statement = a(c[l++]) : e === "verified_by" ? s.verifiedBy = H(c[l++]) : e === "source" ? s.source = k(i(c[l++])) : i(c[l++]);
+			} else e === "statement" ? s.statement = a(c[l++]) : e === "verified_by" ? s.verifiedBy = V(c[l++]) : e === "source" ? s.source = k(i(c[l++])) : i(c[l++]);
 		}
 		t.push(s);
 	}
 	return t;
 }
-function Ki(e) {
+function qi(e) {
 	return e.id === "" && !e.target && !e.level && !e.conditions && e.verifiedBy.length === 0 && !e.source;
 }
-function qi(e, t) {
+function Ji(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 = Ii(i(r[a++]));
-		else if (e === "provenance") t.is.provenance = Ii(i(r[a++]));
-		else if (e === "structure") t.is.structure = G(i(r[a++]));
-		else if (e === "design_parameters") t.is.designParameters = Li(i(r[a++]));
-		else if (e === "designed_conditions") t.is.designedConditions = Ii(i(r[a++]));
-		else if (e === "promises") t.is.promises = Gi(i(r[a++]));
-		else if (e === "artifacts") t.is.artifacts = G(i(r[a++]));
+		if (e === "metadata") t.is.metadata = Li(i(r[a++]));
+		else if (e === "provenance") t.is.provenance = Li(i(r[a++]));
+		else if (e === "structure") t.is.structure = W(i(r[a++]));
+		else if (e === "design_parameters") t.is.designParameters = Ri(i(r[a++]));
+		else if (e === "designed_conditions") t.is.designedConditions = Li(i(r[a++]));
+		else if (e === "promises") t.is.promises = Ki(i(r[a++]));
+		else if (e === "artifacts") t.is.artifacts = W(i(r[a++]));
 		else if (e === "endpoint") {
 			let e = E(r[a++] ?? ""), n = a < r.length ? i(r[a++]) : "";
-			e && t.is.endpoints.push(ci(e, n));
-		} else e === "composed_of" ? t.is.composedOf = gi(i(r[a++] ?? "")) : a = Ui(t, "is", e, r, a);
+			e && t.is.endpoints.push(li(e, n));
+		} else e === "composed_of" ? t.is.composedOf = _i(i(r[a++] ?? "")) : a = Wi(t, "is", e, r, a);
 	}
 }
-function Ji(e, t) {
+function Yi(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 = Li(i(r[o++]));
-		else if (e === "dimensions") t.has.dimensions = Ri(i(r[o++]));
+		if (e === "attributes") t.has.attributes = Ri(i(r[o++]));
+		else if (e === "dimensions") t.has.dimensions = zi(i(r[o++]));
 		else if (e === "state") t.has.state = a(r[o++]);
-		else if (e === "characteristics") t.has.characteristics = zi(i(r[o++]));
-		else if (e === "environmental_context") t.has.environmentalContext = G(i(r[o++]));
-		else if (e === "artifact_instances") t.has.artifactInstances = G(i(r[o++]));
+		else if (e === "characteristics") t.has.characteristics = Bi(i(r[o++]));
+		else if (e === "environmental_context") t.has.environmentalContext = W(i(r[o++]));
+		else if (e === "artifact_instances") t.has.artifactInstances = W(i(r[o++]));
 		else if (e === "serve") {
-			let e = di(r, o);
+			let e = fi(r, o);
 			t.has.serves.push(e.binding), o = e.next;
-		} else o = Ui(t, "has", e, r, o);
+		} else o = Wi(t, "has", e, r, o);
 	}
 }
-function Yi(e, t) {
+function Xi(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 = Ui(t, "does", e, r, i);
+		e === "behavior" ? t.does.behaviors.push(a(r[i++])) : i = Wi(t, "does", e, r, i);
 	}
 }
-var Xi = function(e, t) {
+var Zi = function(e, t) {
 	let n = {
 		id: e,
 		extends: "",
@@ -5467,11 +5472,11 @@ var Xi = 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" ? qi(i(o[s++]), n) : e === "has" ? Ji(i(o[s++]), n) : e === "does" ? Yi(i(o[s++]), n) : e === "reference" ? n.referenceIds = W(o[s++]) : i(o[s++]);
+		e === "extends" ? n.extends = a(o[s++]) : e === "is" ? Ji(i(o[s++]), n) : e === "has" ? Yi(i(o[s++]), n) : e === "does" ? Xi(i(o[s++]), n) : e === "reference" ? n.referenceIds = U(o[s++]) : i(o[s++]);
 	}
 	return (t) => (t.subjects[e] = n, t);
 };
-function Zi(e, t) {
+function Qi(e, t) {
 	return {
 		id: t.id,
 		extends: "",
@@ -5521,24 +5526,24 @@ function Zi(e, t) {
 		misplacedAspects: t.misplacedAspects
 	};
 }
-function Qi(e, t) {
+function $i(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), Zi(n(a, r), t)) : t;
+		return a ? (r.add(i), Qi(n(a, r), t)) : t;
 	};
 	return n(t, /* @__PURE__ */ new Set([t.id]));
 }
-function $i(e, t) {
+function ea(e, t) {
 	let n = Object.keys(t);
 	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " " + T(t[e])).join(" ") + " }\n";
 }
-function ea(e, t) {
+function ta(e, t) {
 	let n = Object.keys(t);
 	return n.length === 0 ? "" : "    " + e + " { " + n.map((e) => e + " :" + (t[e] ? " " + T(t[e]) : "")).join(" ") + " }\n";
 }
-function ta(e, t) {
+function G(e, t) {
 	return t.length === 0 ? "" : "    " + e + " { " + t.map(T).join(" ") + " }\n";
 }
 function na(e) {
@@ -5558,14 +5563,14 @@ function ia(e) {
 }
 function aa(e) {
 	if (e.length === 0) return "";
-	if (e.every(Ki)) return "    promises { " + e.map((e) => T(e.statement)).join(" ") + " }\n";
+	if (e.every(qi)) return "    promises { " + e.map((e) => T(e.statement)).join(" ") + " }\n";
 	let t = "    promises {\n";
 	for (let n of e) {
-		if (Ki(n)) {
+		if (qi(n)) {
 			t += "      " + T(n.statement) + "\n";
 			continue;
 		}
-		t += "      " + T(n.id) + " {\n", n.target && (t += "        target " + T(n.target) + "\n"), n.level && (t += "        level " + ia(n.level) + "\n"), n.conditions && (t += "        conditions " + ra(n.conditions) + "\n"), n.statement && (t += "        statement \"" + s(n.statement) + "\"\n"), t += U("verified_by", n.verifiedBy, "        "), t += V("source", n.source ?? null, "        "), t += "      }\n";
+		t += "      " + T(n.id) + " {\n", n.target && (t += "        target " + T(n.target) + "\n"), n.level && (t += "        level " + ia(n.level) + "\n"), n.conditions && (t += "        conditions " + ra(n.conditions) + "\n"), n.statement && (t += "        statement \"" + s(n.statement) + "\"\n"), t += H("verified_by", n.verifiedBy, "        "), t += B("source", n.source ?? null, "        "), t += "      }\n";
 	}
 	return t += "    }\n", t;
 }
@@ -5576,7 +5581,7 @@ function oa(e) {
 	for (let r of t) {
 		let t = e[r];
 		if (t.behavior || t.quantityKind || t.unit || t.source && (t.source.doc || t.source.clause)) {
-			n += "      " + r + " {\n", t.symbol && (n += "        symbol \"" + s(t.symbol) + "\"\n"), t.derivation && (n += "        derivation " + ra(t.derivation) + "\n"), t.behavior && (n += "        behavior " + T(t.behavior) + "\n"), t.quantityKind && (n += "        quantity_kind " + T(t.quantityKind) + "\n"), t.unit && (n += "        unit \"" + s(t.unit) + "\"\n"), n += V("source", t.source ?? null, "        "), n += "      }\n";
+			n += "      " + r + " {\n", t.symbol && (n += "        symbol \"" + s(t.symbol) + "\"\n"), t.derivation && (n += "        derivation " + ra(t.derivation) + "\n"), t.behavior && (n += "        behavior " + T(t.behavior) + "\n"), t.quantityKind && (n += "        quantity_kind " + T(t.quantityKind) + "\n"), t.unit && (n += "        unit \"" + s(t.unit) + "\"\n"), n += B("source", t.source ?? null, "        "), n += "      }\n";
 			continue;
 		}
 		n += "      " + r + (t.symbol ? " " + t.symbol : ""), t.derivation && (n += " = " + ra(t.derivation)), n += "\n";
@@ -5585,60 +5590,60 @@ function oa(e) {
 }
 function sa(e) {
 	let t = "";
-	for (let n of e) t += ui(n, "    ");
+	for (let n of e) t += di(n, "    ");
 	return t;
 }
 function ca(e) {
 	let t = "";
-	for (let n of e) t += fi(n, "    ");
+	for (let n of e) t += pi(n, "    ");
 	return t;
 }
 var la = function(e) {
 	let t = "subject " + e.id + " {\n";
 	e.extends && (t += "  extends " + e.extends + "\n");
-	let n = $i("metadata", e.is.metadata) + $i("provenance", e.is.provenance) + ta("structure", e.is.structure) + ea("design_parameters", e.is.designParameters) + $i("designed_conditions", e.is.designedConditions) + aa(e.is.promises) + ta("artifacts", e.is.artifacts) + sa(e.is.endpoints) + (e.is.composedOf ? vi(e.is.composedOf, "    ") : "");
+	let n = ea("metadata", e.is.metadata) + ea("provenance", e.is.provenance) + G("structure", e.is.structure) + ta("design_parameters", e.is.designParameters) + ea("designed_conditions", e.is.designedConditions) + aa(e.is.promises) + G("artifacts", e.is.artifacts) + sa(e.is.endpoints) + (e.is.composedOf ? yi(e.is.composedOf, "    ") : "");
 	n && (t += "  is {\n" + n + "  }\n");
-	let r = ea("attributes", e.has.attributes) + na(e.has.dimensions) + (e.has.state ? "    state " + T(e.has.state) + "\n" : "") + oa(e.has.characteristics) + ta("environmental_context", e.has.environmentalContext) + ta("artifact_instances", e.has.artifactInstances) + ca(e.has.serves);
+	let r = ta("attributes", e.has.attributes) + na(e.has.dimensions) + (e.has.state ? "    state " + T(e.has.state) + "\n" : "") + oa(e.has.characteristics) + G("environmental_context", e.has.environmentalContext) + G("artifact_instances", e.has.artifactInstances) + ca(e.has.serves);
 	r && (t += "  has {\n" + r + "  }\n");
 	let i = "";
 	for (let t of e.does.behaviors) i += "    behavior " + T(t) + "\n";
-	return i && (t += "  does {\n" + i + "  }\n"), t += U("reference", e.referenceIds, "  "), t += "}\n", t;
+	return i && (t += "  does {\n" + i + "  }\n"), t += H("reference", e.referenceIds, "  "), t += "}\n", t;
 }, ua = {
 	keyword: "instrument",
 	field: "instruments",
 	takesID: !0,
-	parse: yi,
-	dump: Ei
+	parse: bi,
+	dump: Di
 }, da = {
 	keyword: "attribute_definition",
 	field: "attributeDefinitions",
 	takesID: !0,
-	parse: Di,
-	dump: Oi
+	parse: Oi,
+	dump: ki
 }, fa = {
 	keyword: "capability",
 	field: "capabilities",
 	takesID: !0,
-	parse: ki,
-	dump: Ai
+	parse: Ai,
+	dump: ji
 }, pa = {
 	keyword: "behavior",
 	field: "behaviors",
 	takesID: !0,
-	parse: ji,
-	dump: Mi
+	parse: Mi,
+	dump: Ni
 }, ma = {
 	keyword: "condition_set",
 	field: "conditionSets",
 	takesID: !0,
-	parse: Ni,
-	dump: Fi
+	parse: Pi,
+	dump: Ii
 }, ha = {
 	keyword: "subject",
 	field: "subjects",
 	takesID: !0,
-	parse: Xi,
-	resolve: Qi,
+	parse: Zi,
+	resolve: $i,
 	dump: la
 };
 //#endregion
@@ -6653,8 +6658,8 @@ var yo = [
 		keyword: "term",
 		field: "terms",
 		takesID: !0,
-		parse: yr,
-		dump: br
+		parse: br,
+		dump: xr
 	}),
 	K({
 		keyword: "form",
@@ -6690,43 +6695,43 @@ var yo = [
 		keyword: "verdict",
 		field: "verdicts",
 		takesID: !0,
-		parse: Cr,
-		dump: wr
+		parse: wr,
+		dump: Tr
 	}),
 	K({
 		keyword: "reference_material",
 		field: "referenceMaterials",
 		takesID: !0,
-		parse: Dr,
-		dump: kr
+		parse: Or,
+		dump: Ar
 	}),
 	K({
 		keyword: "test_point_set",
 		field: "testPointSets",
 		takesID: !0,
-		parse: Rr,
-		dump: zr
+		parse: zr,
+		dump: Br
 	}),
 	K({
 		keyword: "competence_kind",
 		field: "competenceKinds",
 		takesID: !0,
-		parse: sr,
-		dump: cr
+		parse: cr,
+		dump: lr
 	}),
 	K({
 		keyword: "constraint",
 		field: "constraints",
 		takesID: !0,
-		parse: jr,
-		dump: Mr
+		parse: Mr,
+		dump: Nr
 	}),
 	K({
 		keyword: "discrepancy_record",
 		field: "discrepancyRecords",
 		takesID: !0,
-		parse: Pr,
-		dump: Fr
+		parse: Fr,
+		dump: Ir
 	}),
 	K({
 		keyword: "state_machine",
@@ -6735,20 +6740,20 @@ var yo = [
 		parse: Mn,
 		dump: Fn
 	}),
-	Yr,
 	Xr,
+	Zr,
 	ua,
 	da,
 	fa,
 	pa,
 	ma,
-	ni,
+	ri,
 	K({
 		keyword: "conformance_test",
 		field: "conformanceTests",
 		takesID: !0,
-		parse: _r,
-		dump: vr
+		parse: vr,
+		dump: yr
 	}),
 	ha,
 	wa,
@@ -6763,7 +6768,7 @@ var yo = [
 		parse: _o,
 		dump: vo
 	}),
-	pi,
+	mi,
 	Xa,
 	to,
 	no,
@@ -6802,7 +6807,7 @@ function So(e) {
 	return t;
 }
 var Co = {
-	package: { parse: ei },
+	package: { parse: ti },
 	root: { parse: (e) => (t) => (t.root = e.trim(), t) },
 	metadata: { parse: m },
 	version: { parse: () => (e) => e },
@@ -6954,7 +6959,7 @@ function zo(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 };
-	ei(n)(r);
+	ti(n)(r);
 	let i = r.packageManifest;
 	if (!i || !i.id) throw Error(`loadPackage: ${t} is not a valid package manifest`);
 	return i;
@@ -8011,4 +8016,4 @@ function Vs(e) {
 	return Oo(e);
 }
 //#endregion
-export { Y as CompositionError, es as PRIMITIVE_TYPES, gs as TIER_BY_FIELD, hs as TIER_ORDER, ps as applyView, ss as buildProcessTree, Q as canonical, Ds as clauseTextKey, os as collectMappings, ms as componentIds, ls as computeCoverage, Ms as diffStandards, us as discoverTransitive, Bs as dump, ti as dumpPackage, Zo as dumpPrm, Ho as effectiveUses, Es as elementIndex, Fs as formatDiffReport, is as isWellFormedMapType, Is as load, Rs as loadFile, zs as loadFileWithIssues, Ro as loadPackage, Vo as loadPackageWithIssues, Xo as loadPrm, Ls as loadWithIssues, $o as mapProfilesToPrm, as as mappingsFromProfile, vs as normalizeSourceRef, Lo as packageFiles, Z as parseTargetRef, rs as parseTypeExpression, Qo as prmToMapProfiles, zo as readPackageManifest, ds as repoMap, Vs as validate };
+export { Y as CompositionError, es as PRIMITIVE_TYPES, gs as TIER_BY_FIELD, hs as TIER_ORDER, ps as applyView, ss as buildProcessTree, Q as canonical, Ds as clauseTextKey, os as collectMappings, ms as componentIds, ls as computeCoverage, Ms as diffStandards, us as discoverTransitive, Bs as dump, ni as dumpPackage, Zo as dumpPrm, Ho as effectiveUses, Es as elementIndex, Fs as formatDiffReport, is as isWellFormedMapType, Is as load, Rs as loadFile, zs as loadFileWithIssues, Ro as loadPackage, Vo as loadPackageWithIssues, Xo as loadPrm, Ls as loadWithIssues, $o as mapProfilesToPrm, as as mappingsFromProfile, vs as normalizeSourceRef, Lo as packageFiles, Z as parseTargetRef, rs as parseTypeExpression, Qo as prmToMapProfiles, zo as readPackageManifest, ds as repoMap, Vs as validate };