@primmel/primmel 1.21.15 → 1.21.17

package/dist/src/types/Requirement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Requirement.d.ts","sourceRoot":"","sources":["../../../src/types/Requirement.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,kBAAkB,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,wEAAwE;AACxE,MAAM,WAAW,uBAAuB;IACtC,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC7C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,oDAAoD;IACpD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,IAAI,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,mEAAmE;IACnE,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACxC;;;;OAIG;IACH,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChD,kEAAkE;IAClE,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACtC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC7C;AAED,0EAA0E;AAC1E,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,sEAAsE;AACtE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,kEAAkE;IAClE,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,wEAAwE;IACxE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IACpC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC/B,2DAA2D;IAC3D,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oFAAoF;IACpF,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2DAA2D;IAC3D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0DAA0D;IAC1D,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iDAAiD;IACjD,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC5C,MAAM,EAAE,SAAS,GAAG,IAAI,CAAC;IACzB;;wDAEoD;IACpD,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB;iEAC6D;IAC7D,IAAI,CAAC,EAAE,OAAO,OAAO,EAAE,GAAG,EAAE,CAAC;IAC7B,iEAAiE;IACjE,eAAe,CAAC,EAAE,OAAO,kBAAkB,EAAE,cAAc,EAAE,CAAC;IAC9D,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,uFAAuF;IACvF,aAAa,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACrC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB"}
+{"version":3,"file":"Requirement.d.ts","sourceRoot":"","sources":["../../../src/types/Requirement.ts"],"names":[],"mappings":"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"}

package/dist-browser/index.mjs

@@ -5587,7 +5587,23 @@ var Li = function(e, t) {
 		else if (t === "instances") o.instances = Oi(i(s()));
 		else if (t === "inherits_from") o.inheritsFrom = a(s());
 		else if (t === "result_forms") o.resultForms = U(s());
-		else if (t === "produces_artifacts") o.producesArtifacts = U(s());
+		else if (t === "run") {
+			let t = r(i(s())), n = {
+				performedBy: "",
+				store: "",
+				trajectory: ""
+			}, c = 0;
+			for (; c < t.length;) {
+				let r = t[c++];
+				if (c >= t.length) throw Error(`Parsing error: conformance_test. ID ${e}: run expects a value for ${r}`);
+				if (r === "performed_by") {
+					let r = a(t[c++]);
+					if (r !== "laboratory" && r !== "manufacturer") throw Error(`Parsing error: conformance_test. ID ${e}: Unknown run performer ${r} (valid: laboratory, manufacturer)`);
+					n.performedBy = r;
+				} else r === "store" ? n.store = a(t[c++]) : r === "trajectory" ? n.trajectory = a(t[c++]) : c = b(t, c, r);
+			}
+			o.run = n;
+		} else if (t === "produces_artifacts") o.producesArtifacts = U(s());
 		else if (t === "report_rows") o.reportRows = U(s());
 		else if (t === "derived_values") o.derivedValues = Ei(i(s()));
 		else if (t === "validate_measurement") {
@@ -5680,7 +5696,7 @@ var Li = function(e, t) {
 		}
 		t += n + "} }\n";
 	}
-	if (e.inheritsFrom && (t += "  inherits_from " + e.inheritsFrom + "\n"), e.resultForms.length > 0 && (t += "  result_forms { " + e.resultForms.join(" ") + " }\n"), e.producesArtifacts && e.producesArtifacts.length > 0 && (t += "  produces_artifacts { " + e.producesArtifacts.join(" ") + " }\n"), e.reportRows && e.reportRows.length > 0 && (t += "  report_rows { " + e.reportRows.join(" ") + " }\n"), e.derivedValues.length > 0) {
+	if (e.inheritsFrom && (t += "  inherits_from " + e.inheritsFrom + "\n"), e.resultForms.length > 0 && (t += "  result_forms { " + e.resultForms.join(" ") + " }\n"), e.run && (t += "  run {\n", e.run.performedBy && (t += "    performed_by " + e.run.performedBy + "\n"), e.run.store && (t += "    store " + e.run.store + "\n"), e.run.trajectory && (t += "    trajectory " + e.run.trajectory + "\n"), t += "  }\n"), e.producesArtifacts && e.producesArtifacts.length > 0 && (t += "  produces_artifacts { " + e.producesArtifacts.join(" ") + " }\n"), e.reportRows && e.reportRows.length > 0 && (t += "  report_rows { " + e.reportRows.join(" ") + " }\n"), e.derivedValues.length > 0) {
 		t += "  derived_values {\n";
 		for (let n of e.derivedValues) t += "    value " + n.name + " { expression \"" + s(n.expression) + "\" }\n";
 		t += "  }\n";
@@ -6408,8 +6424,11 @@ function Da() {
 	};
 }
 function Oa(e) {
-	let t = Da();
-	return Aa(n(e), t, 0), t;
+	let t = Da(), r = n(e);
+	Aa(r, t, 0);
+	let a = 0;
+	for (; a < r.length;) r[a] === "when" && r[a + 1]?.startsWith("{") ? (t.when = ce(i(r[a + 1])), a += 2) : a += 1;
+	return t;
 }
 function ka(e) {
 	return ce(e);
@@ -6549,8 +6568,12 @@ var Na = function(e, t) {
 		else if (e === "binds_to") o.bindsTo = Ta(s[c++]);
 		else if (e === "subjects") o.subjects = ja(i(s[c++]));
 		else if (e === "parameters") o.parameters = Ma(i(s[c++]));
-		else if (e === "limit") o.limit = Oa(i(s[c++]));
-		else if (e === "applicability") o.applicability = R(i(s[c++]));
+		else if (e === "limit") {
+			let e = "";
+			s[c] !== void 0 && !s[c].startsWith("{") && (e = a(s[c++]));
+			let t = Oa(i(s[c++]));
+			e ? (t.name = e, (o.limits ??= []).push(t)) : o.limit ? (o.limits ??= []).push(t) : o.limit = t;
+		} else if (e === "applicability") o.applicability = R(i(s[c++]));
 		else if (e === "channel") o.channel = a(s[c++]);
 		else if (e === "report_row") o.reportRow = a(s[c++]);
 		else if (e === "obligation") o.obligation = a(s[c++]);
@@ -6579,12 +6602,17 @@ var Na = function(e, t) {
 };
 function Pa(e) {
 	if (e.argsBound) {
-		let t = "  limit {\n";
+		let t = e.name ? "  limit " + JSON.stringify(e.name) + " {\n" : "  limit {\n";
 		if ((e.args ?? []).length > 0) {
 			t += "    args {\n";
 			for (let n of e.args ?? []) t += "      " + n.name + " <- " + n.source + "\n";
 			t += "    }\n";
 		}
+		if (e.when) {
+			t += "    when {\n";
+			for (let n of e.when.split("\n")) t += "      " + n + "\n";
+			t += "    }\n";
+		}
 		t += "    expression {\n";
 		for (let n of e.expression.split("\n")) t += "      " + n + "\n";
 		if (t += "    }\n", e.modality && (t += "    modality " + e.modality + "\n"), e.relativeTo && (t += "    relative_to " + e.relativeTo + "\n"), e.notes && (t += "    notes \"" + s(e.notes) + "\"\n"), e.accepts) {
@@ -6619,7 +6647,11 @@ var Fa = function(e) {
 		}
 		t += "  }\n";
 	}
-	if (e.limit && (t += Pa(e.limit)), e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n"), e.channel && (t += "  channel " + e.channel + "\n"), e.reportRow && (t += "  report_row " + e.reportRow + "\n"), e.obligation && (t += "  obligation " + e.obligation + "\n"), e.acceptanceCriteria && (t += "  acceptance_criteria {\n    " + e.acceptanceCriteria + "\n  }\n"), e.verificationMethod) {
+	if (e.limit) {
+		t += Pa(e.limit);
+		for (let n of e.limits ?? []) t += Pa(n);
+	}
+	if (e.applicability.length > 0 && (t += "  applicability {\n    " + z(e.applicability).trim() + "\n  }\n"), e.channel && (t += "  channel " + e.channel + "\n"), e.reportRow && (t += "  report_row " + e.reportRow + "\n"), e.obligation && (t += "  obligation " + e.obligation + "\n"), e.acceptanceCriteria && (t += "  acceptance_criteria {\n    " + e.acceptanceCriteria + "\n  }\n"), e.verificationMethod) {
 		let n = "  verification { method " + e.verificationMethod;
 		e.verificationDescription && (n += " description \"" + s(e.verificationDescription) + "\""), t += n + " }\n";
 	}

package/dist-cli/primmel.mjs

@@ -10153,6 +10153,39 @@ var parseConformanceTest = function(id, data) {
         result.inheritsFrom = stripWrapping(value());
       } else if (keyword === "result_forms") {
         result.resultForms = readStringList(value());
+      } else if (keyword === "run") {
+        const runBlock = unwrapBlock(value());
+        const rt = tokenizePackage(runBlock);
+        const run = {
+          performedBy: "",
+          store: "",
+          trajectory: ""
+        };
+        let ri = 0;
+        while (ri < rt.length) {
+          const rk = rt[ri++];
+          if (ri >= rt.length) {
+            throw new Error(
+              `Parsing error: conformance_test. ID ${id}: run expects a value for ${rk}`
+            );
+          }
+          if (rk === "performed_by") {
+            const who = stripWrapping(rt[ri++]);
+            if (who !== "laboratory" && who !== "manufacturer") {
+              throw new Error(
+                `Parsing error: conformance_test. ID ${id}: Unknown run performer ${who} (valid: laboratory, manufacturer)`
+              );
+            }
+            run.performedBy = who;
+          } else if (rk === "store") {
+            run.store = stripWrapping(rt[ri++]);
+          } else if (rk === "trajectory") {
+            run.trajectory = stripWrapping(rt[ri++]);
+          } else {
+            ri = skipUnknownValue(rt, ri, rk);
+          }
+        }
+        result.run = run;
       } else if (keyword === "produces_artifacts") {
         result.producesArtifacts = readStringList(value());
       } else if (keyword === "report_rows") {
@@ -10454,6 +10487,19 @@ var dumpConformanceTest = function(ct) {
   if (ct.resultForms.length > 0) {
     out += "  result_forms { " + ct.resultForms.join(" ") + " }\n";
   }
+  if (ct.run) {
+    out += "  run {\n";
+    if (ct.run.performedBy) {
+      out += "    performed_by " + ct.run.performedBy + "\n";
+    }
+    if (ct.run.store) {
+      out += "    store " + ct.run.store + "\n";
+    }
+    if (ct.run.trajectory) {
+      out += "    trajectory " + ct.run.trajectory + "\n";
+    }
+    out += "  }\n";
+  }
   if (ct.producesArtifacts && ct.producesArtifacts.length > 0) {
     out += "  produces_artifacts { " + ct.producesArtifacts.join(" ") + " }\n";
   }
@@ -12008,7 +12054,17 @@ function blankLimit() {
 }
 function readLimit(block) {
   const limit = blankLimit();
-  readLegacyLimitFields(tokenize(block), limit, 0);
+  const lt = tokenize(block);
+  readLegacyLimitFields(lt, limit, 0);
+  let i = 0;
+  while (i < lt.length) {
+    if (lt[i] === "when" && lt[i + 1]?.startsWith("{")) {
+      limit.when = canonicalizeExpression(unwrapBlock(lt[i + 1]));
+      i += 2;
+    } else {
+      i += 1;
+    }
+  }
   return limit;
 }
 function readExpressionBlock(raw) {
@@ -12239,7 +12295,19 @@ var parseRequirement = function(id, data) {
     } else if (cmd === "parameters") {
       result.parameters = readParameters(unwrapBlock(t[i++]));
     } else if (cmd === "limit") {
-      result.limit = readLimit(unwrapBlock(t[i++]));
+      let name = "";
+      if (t[i] !== void 0 && !t[i].startsWith("{")) {
+        name = stripWrapping(t[i++]);
+      }
+      const lim = readLimit(unwrapBlock(t[i++]));
+      if (name) {
+        lim.name = name;
+        (result.limits ??= []).push(lim);
+      } else if (result.limit) {
+        (result.limits ??= []).push(lim);
+      } else {
+        result.limit = lim;
+      }
     } else if (cmd === "applicability") {
       result.applicability = parseApplicability(unwrapBlock(t[i++]));
     } else if (cmd === "channel") {
@@ -12298,7 +12366,8 @@ var parseRequirement = function(id, data) {
 };
 function dumpLimit(limit) {
   if (limit.argsBound) {
-    let out2 = "  limit {\n";
+    const head = limit.name ? "  limit " + JSON.stringify(limit.name) + " {\n" : "  limit {\n";
+    let out2 = head;
     if ((limit.args ?? []).length > 0) {
       out2 += "    args {\n";
       for (const a of limit.args ?? []) {
@@ -12306,6 +12375,13 @@ function dumpLimit(limit) {
       }
       out2 += "    }\n";
     }
+    if (limit.when) {
+      out2 += "    when {\n";
+      for (const line of limit.when.split("\n")) {
+        out2 += "      " + line + "\n";
+      }
+      out2 += "    }\n";
+    }
     out2 += "    expression {\n";
     for (const line of limit.expression.split("\n")) {
       out2 += "      " + line + "\n";
@@ -12455,6 +12531,9 @@ var dumpRequirement = function(r) {
   }
   if (r.limit) {
     out += dumpLimit(r.limit);
+    for (const lim of r.limits ?? []) {
+      out += dumpLimit(lim);
+    }
   }
   if (r.applicability.length > 0) {
     out += "  applicability {\n    " + dumpApplicabilityEntries(r.applicability).trim() + "\n  }\n";
@@ -23506,6 +23585,22 @@ var CHECK_RULES = [
     "normal",
     "an uncertainty budget targets a declared verdict; a Type A component names a declared captured series, a Type B component states its distribution and half-width; the coverage factor is a positive number"
   ),
+  R(
+    "C180",
+    "run-plane-shape",
+    "coverage",
+    "error",
+    "normal",
+    "the run facet of a conformance test declares the execution: the performer is in the closed vocabulary (laboratory | manufacturer), the store names a declared data_registry, the trajectory names a declared state_machine"
+  ),
+  R(
+    "C181",
+    "run-store-binds",
+    "coverage",
+    "error",
+    "normal",
+    "the run store registry and the record forms of the test agree on the data class \u2014 the output records and the store hold the same shape"
+  ),
   R(
     "C173",
     "step-plane-refs-resolve",
@@ -26818,9 +26913,76 @@ function checkPackage(dir, options = {}) {
     };
     kindOf(ast);
   };
+  const checkGuard = (rid, name, lim) => {
+    if (!lim.when) {
+      return;
+    }
+    const args2 = new Set((lim.args ?? []).map((a) => a.name));
+    try {
+      const ast = parseExpression(lim.when);
+      const ids = freeIdentifiers(ast);
+      for (const call of new Set(ids.calls)) {
+        if (!INLINE_FUNCTION_WORDS.has(call)) {
+          err(
+            "C171",
+            `requirement ${rid}: limit ${name}'s when-guard calls "${call}(\u2026)", which no argument binds and which is not in the expression function vocabulary (expression-identifiers-resolve)`
+          );
+        }
+      }
+      for (const id of new Set(ids.names)) {
+        const root = id.split(".")[0];
+        if (args2.has(id) || id.includes(".") && (root === "self" || CONTEXT_ROOTS.has(root) || args2.has(root))) {
+          continue;
+        }
+        err(
+          "C171",
+          `requirement ${rid}: limit ${name}'s when-guard names "${id}", which no argument binds (expression-identifiers-resolve)`
+        );
+      }
+      const top = ast.type;
+      if (!(top === "binop" && [
+        "<=",
+        ">=",
+        "<",
+        ">",
+        "=",
+        "!=",
+        "\u2260",
+        "and",
+        "or",
+        "xor",
+        "implies"
+      ].includes(ast.op) || top === "unop" && ast.op === "not")) {
+        err(
+          "C84",
+          `requirement ${rid}: limit ${name}'s when-guard does not evaluate to a boolean \u2014 the guard is one comparison or logical composition (constraint-shape)`
+        );
+      }
+    } catch (e) {
+      err(
+        "C171",
+        `requirement ${rid}: limit ${name}'s when-guard does not parse \u2014 ${String(e.message ?? e)} (expression-identifiers-resolve)`
+      );
+    }
+  };
   for (const r of standard.requirements ?? []) {
     if (r.limit?.argsBound) {
       checkInlineLimit("requirement", r.id, r.limit, null);
+      checkGuard(r.id, "(the unnamed limit)", r.limit);
+    }
+    for (const lim of r.limits ?? []) {
+      const label = lim.name ? `"${lim.name}"` : "(an unnamed limit)";
+      if (lim.argsBound) {
+        checkInlineLimit("requirement", r.id, lim, null);
+      } else if (lim.expression) {
+        err(
+          "C171",
+          `requirement ${r.id}: limit ${label} must carry the inline carrier \u2014 args { \u2026 } and expression { \u2026 } (expression-identifiers-resolve)`
+        );
+      }
+      checkGuard(r.id, label, lim);
+    }
+    if (r.limit?.argsBound || (r.limits ?? []).length > 0) {
       continue;
     }
     const expr = r.limit?.expression;
@@ -26901,8 +27063,51 @@ function checkPackage(dir, options = {}) {
       );
     }
   }
+  const runChecks = (t) => {
+    const run = t.run;
+    if (!run) {
+      return;
+    }
+    if (run.performedBy !== "laboratory" && run.performedBy !== "manufacturer") {
+      err(
+        "C180",
+        `conformance test ${t.id}: run performer "${run.performedBy}" is outside the closed vocabulary (laboratory | manufacturer) (run-plane-shape)`
+      );
+    }
+    if (run.store) {
+      const reg = (standard.regs ?? []).find((r) => r.id === run.store);
+      if (!reg) {
+        err(
+          "C180",
+          `conformance test ${t.id}: run store "${run.store}" names no declared data_registry \u2014 the collected records land in a declared store (run-plane-shape)`
+        );
+      } else if (reg.data?.id) {
+        for (const formId of t.resultForms ?? []) {
+          const form = (standard.forms ?? []).find((f) => f.id === formId);
+          if (form?.dataClassId && form.dataClassId !== reg.data.id) {
+            err(
+              "C181",
+              `conformance test ${t.id}: the run's store "${run.store}" holds ${reg.data.id}, but its record form ${formId} captures ${form.dataClassId} \u2014 the output records and the store must agree on the data class (run-store-binds)`
+            );
+          }
+        }
+      }
+    }
+    if (run.trajectory) {
+      const machine = (standard.stateMachines ?? []).find(
+        (m) => m.entityName === run.trajectory
+      );
+      if (!machine) {
+        err(
+          "C180",
+          `conformance test ${t.id}: run trajectory "${run.trajectory}" names no declared state_machine \u2014 the run folds a declared trajectory (run-plane-shape)`
+        );
+      }
+    }
+  };
   for (const t of standard.conformanceTests ?? []) {
     const scope = (t.variables ?? []).map((v) => v.name);
+    runChecks(t);
     for (const v of t.variables ?? []) {
       if (!v.derivation) {
         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primmel/primmel",
-  "version": "1.21.15",
+  "version": "1.21.17",
   "description": "Primmel — parser, types, and serializer for the Primmel modelling language (successor to MMEL)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",