@primmel/primmel 1.21.18 → 1.21.19

package/dist-cli/primmel.mjs

@@ -676,6 +676,10 @@ function parseSeriesDecl(block) {
   let i = 0;
   while (i < t.length) {
     const cmd = t[i++];
+    if (cmd === "record") {
+      decl.record = stripWrapping(t[i++]);
+      continue;
+    }
     if (cmd !== "axis" && cmd !== "cell") {
       if (i < t.length) {
         unwrapBlock(t[i - 1]);
@@ -753,7 +757,11 @@ function dumpSeriesDecl(decl) {
   if (decl.cellUnit) {
     out += 'unit "' + escapeString(decl.cellUnit) + '" ';
   }
-  out += "} }";
+  out += "} ";
+  if (decl.record !== void 0) {
+    out += "record " + decl.record + " ";
+  }
+  out += "}";
   return out;
 }
 
@@ -2945,15 +2953,30 @@ function readQuantityBlock(content) {
       break;
     }
     if (cmd === "value") {
-      out.value = coerceValueToken(t[i++]);
+      const rawTok = t[i++];
+      out.value = coerceValueToken(rawTok);
+      const bare = stripWrapping(rawTok);
+      if (typeof out.value === "number" && String(out.value) !== bare) {
+        out.valueLiteral = bare;
+      }
     } else if (cmd === "unit") {
       out.unit = stripWrapping(t[i++]);
     } else if (cmd === "kind" || cmd === "quantity_kind") {
       out.quantityKind = stripWrapping(t[i++]);
     } else if (cmd === "uncertainty") {
-      out.uncertainty = coerceValueToken(t[i++]);
+      const rawTok = t[i++];
+      out.uncertainty = coerceValueToken(rawTok);
+      const bare = stripWrapping(rawTok);
+      if (typeof out.uncertainty === "number" && String(out.uncertainty) !== bare) {
+        out.uncertaintyLiteral = bare;
+      }
     } else if (cmd === "tolerance") {
-      out.tolerance = coerceValueToken(t[i++]);
+      const rawTok = t[i++];
+      out.tolerance = coerceValueToken(rawTok);
+      const bare = stripWrapping(rawTok);
+      if (typeof out.tolerance === "number" && String(out.tolerance) !== bare) {
+        out.toleranceLiteral = bare;
+      }
     } else if (cmd === "provenance") {
       out.provenance = readProvenanceBlock(unwrapBlock(t[i++]));
     } else {
@@ -3025,13 +3048,15 @@ function dumpScalarToken(v) {
 }
 function dumpQuantityValue(v) {
   if (!needsQuantityBlock(v)) {
-    const val = dumpScalarToken(v.value);
+    const val = v.valueLiteral ?? dumpScalarToken(v.value);
     return v.unit === void 0 ? val : val + " " + dumpBareSafe(v.unit);
   }
   return dumpQuantityBlock(v);
 }
 function dumpQuantityBlock(v) {
-  const parts = ["value " + dumpScalarToken(v.value)];
+  const parts = [
+    "value " + (v.valueLiteral ?? dumpScalarToken(v.value))
+  ];
   if (v.unit !== void 0) {
     parts.push('unit "' + escapeString(v.unit) + '"');
   }
@@ -3039,10 +3064,14 @@ function dumpQuantityBlock(v) {
     parts.push("kind " + dumpBareSafe(v.quantityKind));
   }
   if (v.uncertainty !== void 0) {
-    parts.push("uncertainty " + dumpScalarToken(v.uncertainty));
+    parts.push(
+      "uncertainty " + (v.uncertaintyLiteral ?? dumpScalarToken(v.uncertainty))
+    );
   }
   if (v.tolerance !== void 0) {
-    parts.push("tolerance " + dumpScalarToken(v.tolerance));
+    parts.push(
+      "tolerance " + (v.toleranceLiteral ?? dumpScalarToken(v.tolerance))
+    );
   }
   if (v.provenance !== void 0) {
     parts.push("provenance " + dumpProvenanceBlock(v.provenance));
@@ -3107,6 +3136,9 @@ function parseParamList(block, allowInitial = false) {
         const [rawValue, rawUnit] = parts;
         const value = coerceValueToken(rawValue);
         const initial = rawUnit === void 0 ? { value } : { value, unit: stripWrapping(rawUnit) };
+        if (typeof value === "number" && String(value) !== stripWrapping(rawValue)) {
+          initial.valueLiteral = stripWrapping(rawValue);
+        }
         param.initial = initial;
       }
     }
@@ -15320,7 +15352,8 @@ var conditionSetConstruct = {
   field: "conditionSets",
   takesID: true,
   parse: parseConditionSet,
-  dump: dumpConditionSet
+  dump: dumpConditionSet,
+  deprecated: "the severity/condition register is the legacy spelling \u2014 migrate to the typed table construct (typed columns, typed rows; the values that decide testing bind in limits via table:<id>.<column>); the legacy spelling keeps parsing as visible debt"
 };
 var subjectConstruct = {
   keyword: "subject",
@@ -23607,6 +23640,14 @@ var CHECK_RULES = [
     "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(
+    "C182",
+    "series-record-fields",
+    "quantities",
+    "error",
+    "normal",
+    "a series variable whose series declares a record form types its row members by that form\u2019s typed fields \u2014 a collection derivation\u2019s lambda members resolve against them, never kind-silent"
+  ),
   R(
     "C173",
     "step-plane-refs-resolve",
@@ -29745,6 +29786,71 @@ function checkPackage(dir, options = {}) {
       }
     }
   }
+  {
+    const recordFormFields = /* @__PURE__ */ new Map();
+    for (const f of standard.forms ?? []) {
+      recordFormFields.set(f.id, new Set((f.fields ?? []).map((x) => x.name)));
+    }
+    const walkMembers = (n, bound, out) => {
+      if (n.type === "nav") {
+        const inner = new Map(bound);
+        inner.set(n.var, n.source);
+        walkMembers(n.body, inner, out);
+        return;
+      }
+      if (n.type === "name" && n.path.length > 0) {
+        const parts = [...n.path[0].split("."), ...n.path.slice(1)];
+        if (parts.length > 1) {
+          const src = bound.get(parts[0]);
+          if (src !== void 0) {
+            out.push({ source: src, field: parts.slice(1).join(".") });
+          }
+        }
+        return;
+      }
+      const kids = n.type === "call" ? n.args : n.type === "binop" ? [n.left, n.right] : n.type === "unop" ? [n.operand] : n.type === "ifelse" ? [n.cond, n.then, n.else] : [];
+      for (const k of kids) {
+        walkMembers(k, bound, out);
+      }
+    };
+    for (const t of standard.conformanceTests ?? []) {
+      for (const v of t.variables ?? []) {
+        const rec = v.series?.record;
+        if (!rec) {
+          continue;
+        }
+        const fields = recordFormFields.get(rec);
+        if (!fields) {
+          err(
+            "C182",
+            `conformance test ${t.id}: variable "${v.name}" series record "${rec}" names no declared form \u2014 the row members type by the record form's fields (series-record-fields)`
+          );
+          continue;
+        }
+        if (!v.derivation) {
+          continue;
+        }
+        let ast;
+        try {
+          ast = parseExpression(
+            v.derivation.replace(/^ocl\{/, "").replace(/\}$/, "")
+          );
+        } catch {
+          continue;
+        }
+        const members = [];
+        walkMembers(ast, /* @__PURE__ */ new Map(), members);
+        for (const m of members) {
+          if (m.source === v.name && !fields.has(m.field)) {
+            err(
+              "C182",
+              `conformance test ${t.id}: variable "${v.name}" derivation names "m.${m.field}" \u2014 the record form ${rec} declares no such field; the row members are its typed fields (series-record-fields)`
+            );
+          }
+        }
+      }
+    }
+  }
   {
     const KNOWN_CONTENT = new Set(PASSPORT_CONTENT_CLASSES);
     const KNOWN_LEVELS = new Set(PASSPORT_UPI_LEVELS);

package/package.json

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