@primmel/primmel 1.21.14 → 1.21.16

package/dist-browser/index.mjs

@@ -1998,7 +1998,6 @@ var st = function(e, t) {
 		for (let e of t.block.split("\n")) n += e === "" ? "\n" : "  " + e + "\n";
 		n += "  }\n";
 	}
-	for (let t of e.stepRequires ?? []) n += "  requires { " + t + " }\n";
 	let i = e.inputRefs && e.inputRefs.length > 0 ? e.inputRefs : e.input.map((e) => e.id);
 	if (i.length > 0) {
 		n += "  reference_data_registry {\n";
@@ -6409,8 +6408,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);
@@ -6550,8 +6552,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++]);
@@ -6580,12 +6586,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) {
@@ -6620,7 +6631,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

@@ -4114,9 +4114,6 @@ var dumpProcess = function(process2, ctx) {
     }
     out += "  }\n";
   }
-  for (const req of process2.stepRequires ?? []) {
-    out += "  requires { " + req + " }\n";
-  }
   const inputIds = process2.inputRefs && process2.inputRefs.length > 0 ? process2.inputRefs : process2.input.map((r) => r.id);
   if (inputIds.length > 0) {
     out += "  reference_data_registry {\n";
@@ -12011,7 +12008,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) {
@@ -12242,7 +12249,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") {
@@ -12301,7 +12320,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 ?? []) {
@@ -12309,6 +12329,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";
@@ -12458,6 +12485,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";
@@ -26821,9 +26851,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;

package/package.json

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