@primmel/primmel 1.4.0 → 1.5.0

package/dist-cli/primmel.mjs

@@ -222,6 +222,7 @@ function parse(mmelString, parsers, options = {}) {
     referenceMaterials: {},
     testPointSets: {},
     competenceKinds: {},
+    predicates: {},
     constraints: {},
     discrepancyRecords: {},
     stateMachines: {},
@@ -1167,6 +1168,21 @@ function dumpSeriesDecl(decl) {
   return out;
 }
 
+// src/ser-des/config/ref.ts
+function parseRef(t, i, stripWrapping2, unwrapBlock2) {
+  const predicate = stripWrapping2(t[i++] ?? "");
+  const target = stripWrapping2(t[i++] ?? "");
+  const ref = { predicate, target };
+  if (i < t.length && t[i].startsWith("{")) {
+    const block = unwrapBlock2(t[i++]);
+    const m = /note\s+"([^"]*)"/.exec(block) ?? /note\s+(\S+)/.exec(block);
+    if (m) {
+      ref.note = m[1];
+    }
+  }
+  return { ref, next: i };
+}
+
 // src/ser-des/config/sourceDiscrepancy.ts
 var VALID_RESOLUTIONS = ["follows_clause_x", "annotated_only"];
 function parseSourceDiscrepancy(block) {
@@ -1346,6 +1362,8 @@ function parseFormField(name, block, type) {
     enumRef: "",
     pattern: "",
     required: false,
+    requiredWhen: "",
+    refs: [],
     measurementMethod: "",
     calculationId: null,
     calculationBindings: [],
@@ -1407,6 +1425,10 @@ function parseFormField(name, block, type) {
       field.bind = stripWrapping(t[i++]);
     } else if (cmd === "required") {
       field.required = stripWrapping(t[i++]) === "true";
+    } else if (cmd === "required_when") {
+      const read = readValueToken(t, i);
+      field.requiredWhen = stripWrapping(read.text);
+      i = read.next;
     } else if (cmd === "measurement_method") {
       field.measurementMethod = stripWrapping(t[i++]);
     } else if (cmd === "calculation") {
@@ -1475,6 +1497,10 @@ function parseFormField(name, block, type) {
       field.referenceIds = tokenizePackage(t[i++]).map(stripWrapping);
     } else if (cmd === "references") {
       field.fieldReferences = parseRoleReferences(unwrapBlock(t[i++]));
+    } else if (cmd === "ref") {
+      const r = parseRef(t, i, stripWrapping, unwrapBlock);
+      field.refs.push(r.ref);
+      i = r.next;
     } else if (cmd === "specification_reference") {
       field.specificationReference = stripWrapping(t[i++]);
     } else if (cmd === "applicability") {
@@ -1721,6 +1747,9 @@ function dumpFormField(field, indent) {
   if (field.required) {
     inner.push("required true");
   }
+  if (field.requiredWhen) {
+    inner.push("required_when " + dumpBareSafe(field.requiredWhen));
+  }
   if (field.measurementMethod) {
     inner.push("measurement_method " + field.measurementMethod);
   }
@@ -1806,6 +1835,13 @@ function dumpFormField(field, indent) {
       "references { " + dumpRoleReferences(field.fieldReferences) + " }"
     );
   }
+  if (field.refs && field.refs.length > 0) {
+    for (const r of field.refs) {
+      inner.push(
+        "ref " + r.predicate + ' "' + escapeString(r.target) + '"' + (r.note ? ' { note "' + escapeString(r.note) + '" }' : "")
+      );
+    }
+  }
   if (field.specificationReference) {
     inner.push(
       'specification_reference "' + escapeString(field.specificationReference) + '"'
@@ -4096,6 +4132,10 @@ var parseForm = function(id, data) {
           result.reportRows = rr;
         } else if (command === "references") {
           result.formReferences = parseRoleReferences(unwrapBlock(t[i++]));
+        } else if (command === "ref") {
+          const r = parseRef(t, i, stripWrapping, unwrapBlock);
+          result.refs = [...result.refs ?? [], r.ref];
+          i = r.next;
         } else if (command === "calculation_context") {
           result.calculationContext = parseCalculationContext(
             unwrapBlock(t[i++])
@@ -4326,6 +4366,7 @@ function makeSubformRefField(subformId, block) {
     enumRef: "",
     pattern: "",
     required: false,
+    requiredWhen: "",
     measurementMethod: "",
     calculationId: null,
     calculationBindings: [],
@@ -4338,6 +4379,7 @@ function makeSubformRefField(subformId, block) {
     defaultValue: "",
     hasDefault: false,
     referenceIds: [],
+    refs: [],
     fieldReferences: [],
     specificationReference: "",
     applicability: [],
@@ -4378,6 +4420,11 @@ var dumpForm = function(f) {
   if (f.formReferences.length > 0) {
     out += "  references { " + dumpRoleReferences(f.formReferences) + " }\n";
   }
+  if (f.refs && f.refs.length > 0) {
+    for (const r of f.refs) {
+      out += "  ref " + r.predicate + ' "' + escapeString(r.target) + '"' + (r.note ? ' { note "' + escapeString(r.note) + '" }' : "") + "\n";
+    }
+  }
   if (f.calculationContext) {
     const cc = f.calculationContext;
     let line = "  calculation_context { ";
@@ -6841,6 +6888,11 @@ var parseConformanceTest = function(id, data) {
         }
       } else if (keyword === "targets") {
         result.targets = tokenizePackage(value());
+      } else if (keyword === "ref") {
+        const block = value();
+        const rt = tokenizePackage(block);
+        const rr = parseRef(rt, 0, stripWrapping, unwrapBlock);
+        (result.refs ??= []).push(rr.ref);
       } else if (keyword === "binds_to") {
         result.bindsTo = tokenizePackage(value());
       } else if (keyword === "applicability") {
@@ -6967,6 +7019,9 @@ var dumpConformanceTest = function(ct) {
   } else if (ct.reference) {
     out += "  reference " + ct.reference + "\n";
   }
+  for (const r of ct.refs ?? []) {
+    out += "  ref " + r.predicate + ' "' + escapeString(r.target) + '"' + (r.note ? ' { note "' + escapeString(r.note) + '" }' : "") + "\n";
+  }
   if (ct.targets.length > 0) {
     out += "  targets {\n";
     for (const t of ct.targets) {
@@ -7678,6 +7733,94 @@ var dumpReferenceMaterial = function(m) {
   return out;
 };
 
+// src/ser-des/config/predicate.ts
+var parsePredicate = function(id, data) {
+  const result = {
+    id,
+    kind: "",
+    description: "",
+    subjectKinds: [],
+    targetKinds: [],
+    resolution: "",
+    inverse: "",
+    transitive: false,
+    symmetric: false
+  };
+  const t = tokenizePackage(data);
+  let i = 0;
+  while (i < t.length) {
+    const keyword = t[i++];
+    if (i >= t.length) {
+      throw new Error(
+        `Parsing error: predicate. ID ${id}: Expecting value for ${keyword}`
+      );
+    }
+    if (keyword === "kind") {
+      const v = stripWrapping(t[i++]);
+      if (v !== "citation" && v !== "semantic") {
+        throw new Error(
+          `Parsing error: predicate. ID ${id}: kind must be citation|semantic (got '${v}')`
+        );
+      }
+      result.kind = v;
+    } else if (keyword === "description" || keyword === "definition") {
+      result.description = stripWrapping(t[i++]);
+    } else if (keyword === "subject_kinds") {
+      result.subjectKinds = tokenizePackage(unwrapBlock(t[i++])).map(
+        stripWrapping
+      );
+    } else if (keyword === "target_kinds") {
+      result.targetKinds = tokenizePackage(unwrapBlock(t[i++])).map(
+        stripWrapping
+      );
+    } else if (keyword === "resolution") {
+      result.resolution = stripWrapping(t[i++]);
+    } else if (keyword === "inverse") {
+      result.inverse = stripWrapping(t[i++]);
+    } else if (keyword === "transitive") {
+      result.transitive = stripWrapping(t[i++]) === "true";
+    } else if (keyword === "symmetric") {
+      result.symmetric = stripWrapping(t[i++]) === "true";
+    } else {
+      i++;
+    }
+  }
+  return (ctx) => {
+    ctx.predicates ??= {};
+    ctx.predicates[id] = result;
+    return ctx;
+  };
+};
+var dumpPredicate = function(p) {
+  let out = "predicate " + p.id + " {\n";
+  if (p.kind) {
+    out += "  kind " + p.kind + "\n";
+  }
+  if (p.description) {
+    out += '  description "' + escapeString(p.description) + '"\n';
+  }
+  if (p.subjectKinds.length > 0) {
+    out += "  subject_kinds { " + p.subjectKinds.join(" ") + " }\n";
+  }
+  if (p.targetKinds.length > 0) {
+    out += "  target_kinds { " + p.targetKinds.join(" ") + " }\n";
+  }
+  if (p.resolution) {
+    out += "  resolution " + p.resolution + "\n";
+  }
+  if (p.inverse) {
+    out += "  inverse " + p.inverse + "\n";
+  }
+  if (p.transitive) {
+    out += "  transitive true\n";
+  }
+  if (p.symmetric) {
+    out += "  symmetric true\n";
+  }
+  out += "}\n";
+  return out;
+};
+
 // src/ser-des/config/constraint.ts
 function readValue2(raw) {
   if (raw.length >= 2 && raw.charAt(0) === '"' && raw.charAt(raw.length - 1) === '"') {
@@ -8244,6 +8387,10 @@ var parseRequirement = function(id, data) {
         result.source = src;
       }
       (result.sourceRefs ??= []).push(src);
+    } else if (cmd === "ref") {
+      const r = parseRef(t, i, stripWrapping, unwrapBlock);
+      (result.refs ??= []).push(r.ref);
+      i = r.next;
     } else {
       unwrapBlock(t[i++]);
     }
@@ -8385,6 +8532,9 @@ var dumpRequirement = function(r) {
   for (const src of r.sourceRefs ?? (r.source && (r.source.doc || r.source.clause) ? [r.source] : [])) {
     out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
   }
+  for (const ref of r.refs ?? []) {
+    out += "  ref " + ref.predicate + ' "' + escapeString(ref.target) + '"' + (ref.note ? ' { note "' + escapeString(ref.note) + '" }' : "") + "\n";
+  }
   out += "}\n";
   return out;
 };
@@ -8562,6 +8712,10 @@ var parsePackage = function(data) {
       manifest.product = stripWrapping(t[i++]);
     } else if (cmd === "maps_to" || cmd === "mapsTo") {
       manifest.mapsTo = readList(t[i++]);
+    } else if (cmd === "ref") {
+      const r = parseRef(t, i, stripWrapping, unwrapBlock);
+      (manifest.refs ??= []).push(r.ref);
+      i = r.next;
     } else if (cmd === "scheme_type" || cmd === "schemeType") {
       manifest.schemeType = stripWrapping(t[i++]);
     } else if (cmd === "provides") {
@@ -12429,6 +12583,14 @@ var CONSTRUCTS = [
     parse: parseCompetenceKind,
     dump: dumpCompetenceKind
   }),
+  // The relation registry (docs/primmel/18): declared ref predicates.
+  defineConstruct({
+    keyword: "predicate",
+    field: "predicates",
+    takesID: true,
+    parse: parsePredicate,
+    dump: dumpPredicate
+  }),
   // Primmel v3 domain constraints (TODO.roadmap/51 — BUG.R60-SSOT gap 7)
   defineConstruct({
     keyword: "constraint",

package/package.json

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