@primmel/primmel 1.8.0 → 1.8.2

package/dist-cli/primmel.mjs

@@ -2045,6 +2045,9 @@ function dumpFormField(field, indent) {
   if (field.examples) {
     inner.push('examples "' + escapeString(field.examples) + '"');
   }
+  if (field.bind) {
+    inner.push("bind " + dumpBareSafe(field.bind));
+  }
   if (field.required) {
     inner.push("required true");
   }
@@ -5082,7 +5085,8 @@ var parseSymbol = function(id, data) {
       } else if (command === "latex") {
         result.latex = unwrapped(value);
       } else if (command === "values") {
-        result.values = tokenizePackage(value());
+        const v = value();
+        result.values = v.startsWith("{") ? tokenizePackage(v).map(stripWrapping) : [stripWrapping(v)];
       } else if (command === "series") {
         result.series = parseSeriesDecl(unwrapBlock(value()));
       } else if (command === "kind") {
@@ -5161,7 +5165,7 @@ var dumpSymbol = function(s) {
     out += '  latex "' + escapeString(s.latex) + '"\n';
   }
   if (s.values.length > 0) {
-    out += "  values " + s.values.join(" ") + "\n";
+    out += "  values { " + s.values.map(dumpBareSafe).join(" ") + " }\n";
   }
   if (s.series) {
     out += "  " + dumpSeriesDecl(s.series) + "\n";
@@ -5360,7 +5364,7 @@ function parseInputs(block) {
           } else if (cmd === "description") {
             description = unwrapBlock(pt[j++]);
           } else if (cmd === "default") {
-            defaultValue = unwrapBlock(pt[j++]);
+            defaultValue = stripWrapping(pt[j++]);
             hasDefault = true;
           } else if (cmd === "enum_values") {
             enumValues = tokenizePackage(unwrapBlock(pt[j++]));
@@ -5494,7 +5498,7 @@ var dumpCalculation = function(c) {
         line += ' description "' + escapeString(inp.description) + '"';
       }
       if (inp.hasDefault) {
-        line += " default " + inp.defaultValue;
+        line += " default " + dumpBareSafe(inp.defaultValue);
       }
       if (inp.enumValues && inp.enumValues.length > 0) {
         line += " enum_values { " + inp.enumValues.join(" ") + " }";
@@ -5763,7 +5767,9 @@ var dumpStateMachine = function(sm) {
   if (sm.kind === "operational") {
     out += "  kind operational\n";
   }
-  out += "  initial " + sm.initialState + "\n";
+  if (sm.initialState) {
+    out += "  initial " + sm.initialState + "\n";
+  }
   if (sm.states.length > 0) {
     out += "  states {\n";
     for (const s of sm.states) {
@@ -7804,6 +7810,9 @@ var dumpTerm = function(term) {
   if (term.source) {
     out += '  source "' + escapeString(term.source) + '"\n';
   }
+  if (term.overlay) {
+    out += "  overlay true\n";
+  }
   if (term.scopeNote) {
     out += '  scope_note "' + escapeString(term.scopeNote) + '"\n';
   }
@@ -10593,6 +10602,9 @@ var dumpAttributeDefinition = function(a) {
   for (const s of attrSources) {
     out += dumpSourceRefAsRef(s, "  ", escapeString);
   }
+  for (const rid of a.referenceIds) {
+    out += '  ref cites "' + escapeString(rid) + '"\n';
+  }
   out += dumpRefs(a.refs, "  ", escapeString);
   out += dumpCorrespondences(
     a.correspondences,
@@ -10624,12 +10636,18 @@ var dumpAttributeDefinition = function(a) {
   if (a.enumRef) {
     out += "  enum " + a.enumRef + "\n";
   }
+  if (a.enumValues && a.enumValues.length > 0) {
+    out += "  enum_values { " + a.enumValues.map(dumpBareSafe).join(" ") + " }\n";
+  }
   if (a.irdi) {
     out += '  irdi "' + escapeString(a.irdi) + '"\n';
   }
   if (a.derived) {
     out += '  derived "' + escapeString(a.derived) + '"\n';
   }
+  if (a.note) {
+    out += '  note "' + escapeString(a.note) + '"\n';
+  }
   out += "}\n";
   return out;
 };
@@ -16748,6 +16766,23 @@ var CHECK_RULES = [
     "error",
     "normal",
     "TODO.primmel/10, MN 114 clause 19.4"
+  ),
+  // ── C109: state-machine-initial-present (the editor wave-03 finding,
+  // primmel/editor#19) ──
+  // The spec's state machine syntax marks `initial` required (the
+  // starting state for new entities). The parser stays total (a machine
+  // without the line loads with initialState '') and the serializer
+  // stays honest (it omits the line — never the dangling keyword that
+  // reparsed as `initial states`), so the refusal lives HERE, at the
+  // language's own validation layer — the C95 contract-ownership
+  // doctrine.
+  R(
+    "C109",
+    "state-machine-initial-present",
+    "state",
+    "error",
+    "normal",
+    "spec sources/state-machines \xA72 (initial: Required), primmel/editor#19 (wave-03 findings)"
   )
 ];
 var byId = new Map(CHECK_RULES.map((r) => [r.id, r]));
@@ -20387,6 +20422,14 @@ function checkPackage(dir, options = {}) {
   const machineById = new Map(
     (standard.stateMachines ?? []).map((sm) => [sm.entityName, sm])
   );
+  for (const sm of standard.stateMachines ?? []) {
+    if (!sm.initialState) {
+      err(
+        "C109",
+        `state_machine ${sm.entityName}: declares no initial state \u2014 initial is required (state-machine-initial-present)`
+      );
+    }
+  }
   const operationalIds = new Set(
     (standard.stateMachines ?? []).filter((sm) => sm.kind === "operational").map((sm) => sm.entityName)
   );

package/package.json

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