@primmel/primmel 1.21.19 → 1.21.20

package/dist-cli/primmel.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // scripts/check.mts
-import { existsSync as existsSync8, readdirSync as readdirSync8, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
-import { join as join10 } from "node:path";
+import { existsSync as existsSync7, readdirSync as readdirSync8, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join9 } from "node:path";
 
 // src/check.ts
 import { existsSync as existsSync5, readdirSync as readdirSync3, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
@@ -322,7 +322,6 @@ function parseDeclarations(declarations, parsers, options = {}) {
     attributeDefinitions: {},
     capabilities: {},
     behaviors: {},
-    conditionSets: {},
     // Primmel v3 subject anatomy (is/has/does — TODO.roadmap/01)
     subjects: {},
     // The identity slots + aspect register (smart TODO.roadmap/40 batch 3)
@@ -14468,153 +14467,6 @@ var dumpBehavior = function(b) {
   out += "}\n";
   return out;
 };
-var parseConditionSet = function(id, data) {
-  const result = {
-    id,
-    role: "",
-    entries: [],
-    source: null,
-    sources: [],
-    referenceIds: []
-  };
-  const t = tokenizePackage(data);
-  let i = 0;
-  while (i < t.length) {
-    const cmd = t[i++];
-    if (i >= t.length) {
-      break;
-    }
-    if (cmd === "role") {
-      result.role = stripWrapping(t[i++]);
-    } else if (cmd === "subject") {
-      result.subject = stripWrapping(t[i++]);
-    } else if (cmd === "description") {
-      result.description = stripWrapping(t[i++]);
-    } else if (cmd === "entries") {
-      result.entries = parseConditionEntries(unwrapBlock(t[i++]));
-    } else if (cmd === "source") {
-      const src = readSource(unwrapBlock(t[i++]));
-      result.sources.push(src);
-      if (!result.source) {
-        result.source = src;
-      }
-    } else if (cmd === "ref") {
-      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
-      i = rr.next;
-      if (rr.ref.predicate === "derives-from") {
-        const b = refTargetToSourceRef(rr.ref.target);
-        if (b) {
-          result.sources.push(b);
-          if (!result.source) {
-            result.source = b;
-          }
-        } else {
-          (result.refs ??= []).push(rr.ref);
-        }
-      } else if (rr.ref.predicate === "cites") {
-        result.referenceIds.push(rr.ref.target);
-      } else {
-        (result.refs ??= []).push(rr.ref);
-      }
-    } else if (cmd === "corresponds") {
-      const cc = parseCorresponds(t, i, stripWrapping);
-      (result.correspondences ??= []).push(cc.corr);
-      i = cc.next;
-    } else if (cmd === "reference") {
-      result.referenceIds = readReference(t[i++]);
-    } else {
-      i = skipUnknownValue(t, i, cmd);
-    }
-  }
-  return (ctx) => {
-    ctx.conditionSets[id] = result;
-    return ctx;
-  };
-};
-function parseConditionEntries(block) {
-  const out = [];
-  const t = tokenize(block);
-  let i = 0;
-  while (i < t.length) {
-    const qk = stripColon(t[i++]);
-    if (!qk) {
-      break;
-    }
-    const entry = {
-      quantityKind: qk,
-      value: "",
-      unit: "",
-      tolerance: ""
-    };
-    if (i < t.length && t[i].startsWith("{")) {
-      const eblock = unwrapBlock(t[i++]);
-      const et = tokenize(eblock);
-      let j = 0;
-      while (j < et.length) {
-        const cmd = et[j++];
-        if (j >= et.length) {
-          break;
-        }
-        if (cmd === "value") {
-          entry.value = stripWrapping(et[j++]);
-        } else if (cmd === "unit") {
-          entry.unit = stripWrapping(et[j++]);
-        } else if (cmd === "tolerance") {
-          entry.tolerance = stripWrapping(et[j++]);
-        } else if (cmd === "note") {
-          entry.note = stripWrapping(et[j++]);
-        } else {
-          unwrapBlock(et[j++]);
-        }
-      }
-    }
-    out.push(entry);
-  }
-  return out;
-}
-var dumpConditionSet = function(cs) {
-  let out = "condition_set " + cs.id + " {\n";
-  if (cs.role) {
-    out += "  role " + cs.role + "\n";
-  }
-  if (cs.subject) {
-    out += "  subject " + cs.subject + "\n";
-  }
-  if (cs.description) {
-    out += '  description "' + escapeString(cs.description) + '"\n';
-  }
-  if (cs.entries.length > 0) {
-    out += "  entries {\n";
-    for (const e of cs.entries) {
-      let line = "    " + e.quantityKind + " { value " + dumpBareSafe(e.value);
-      if (e.unit) {
-        line += ' unit "' + escapeString(e.unit) + '"';
-      }
-      if (e.tolerance) {
-        line += " tolerance " + dumpBareSafe(e.tolerance);
-      }
-      if (e.note) {
-        line += ' note "' + escapeString(e.note) + '"';
-      }
-      out += line + " }\n";
-    }
-    out += "  }\n";
-  }
-  const sources = cs.sources && cs.sources.length > 0 ? cs.sources : cs.source ? [cs.source] : [];
-  for (const s of sources) {
-    out += dumpSourceRefAsRef(s, "  ", escapeString);
-  }
-  out += dumpIdList("reference", cs.referenceIds, "  ");
-  out += dumpRefs(cs.refs, "  ", escapeString);
-  out += dumpCorrespondences(
-    cs.correspondences,
-    "  ",
-    escapeString,
-    dumpBareSafe
-  );
-  out += "}\n";
-  return out;
-};
 function readStringMap2(block) {
   const out = {};
   const t = tokenize(block);
@@ -15347,14 +15199,6 @@ var behaviorConstruct = {
   parse: parseBehavior,
   dump: dumpBehavior
 };
-var conditionSetConstruct = {
-  keyword: "condition_set",
-  field: "conditionSets",
-  takesID: true,
-  parse: parseConditionSet,
-  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",
   field: "subjects",
@@ -20679,7 +20523,6 @@ var CONSTRUCTS = [
   attributeDefinitionConstruct,
   capabilityConstruct,
   behaviorConstruct,
-  conditionSetConstruct,
   conformanceClassConstruct,
   defineConstruct({
     keyword: "conformance_test",
@@ -21330,7 +21173,6 @@ var MERGE_FIELDS = [
   "attributeDefinitions",
   "capabilities",
   "behaviors",
-  "conditionSets",
   "subjects",
   // The documentary identity slots + the qualitative aspect register
   // (smart TODO.roadmap/40 batch 3) compose like the subject anatomy
@@ -22417,7 +22259,6 @@ var TIER_BY_FIELD = {
   attributeDefinitions: "primary",
   capabilities: "primary",
   behaviors: "primary",
-  conditionSets: "primary",
   instances: "primary",
   duals: "primary",
   artifactDefinitions: "primary",
@@ -26107,7 +25948,6 @@ var IDENTITY_PREFIXES = [
 var DIM_ALIASES = {
   humidity_class: "humidity_symbol"
 };
-var NUMERIC_TOKEN = /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/;
 function isIdentityPath(path) {
   return IDENTITY_PREFIXES.some((p) => path.startsWith(p));
 }
@@ -30299,33 +30139,6 @@ function checkPackage(dir, options = {}) {
       }
     }
   }
-  for (const cs of standard.conditionSets ?? []) {
-    for (const e of cs.entries ?? []) {
-      if (!e.unit) {
-        if (NUMERIC_TOKEN.test(e.value)) {
-          err(
-            "C32",
-            `condition_set ${cs.id}: entry "${e.quantityKind}" is a bare physical value \u2014 a numeric condition value carries a unit \u2014 INV-1: no bare numbers (inv1-no-bare-quantity)`
-          );
-        }
-        continue;
-      }
-      const eKind = kindOfUnit(e.unit);
-      if (eKind === void 0) {
-        if (registersExist) {
-          warn(
-            "C33",
-            `condition_set ${cs.id}: entry "${e.quantityKind}" carries unit "${e.unit}", which no quantity_register declares (quantity-coherence)`
-          );
-        }
-      } else if (kindDecl.has(e.quantityKind) && eKind !== e.quantityKind) {
-        err(
-          "C33",
-          `condition_set ${cs.id}: entry "${e.quantityKind}" carries unit "${e.unit}" (kind ${eKind}) \u2014 the unit does not measure the entry's quantity kind (quantity-coherence)`
-        );
-      }
-    }
-  }
   const unitables = [
     ...(standard.symbols ?? []).map((s) => ({
       kind: "symbol",
@@ -32176,7 +31989,6 @@ function checkPackage(dir, options = {}) {
     collect("attribute_definition", standard.attributeDefinitions ?? []);
     collect("capability", standard.capabilities ?? []);
     collect("behavior", standard.behaviors ?? []);
-    collect("condition_set", standard.conditionSets ?? []);
     collect("requirement", standard.requirements ?? []);
     collect("conformance_test", standard.conformanceTests ?? []);
     collect("form", standard.forms ?? []);
@@ -32776,7 +32588,6 @@ function checkSpellingCodes(standard) {
     "attributeDefinitions",
     "capabilities",
     "behaviors",
-    "conditionSets",
     "subjects",
     "referenceMaterials",
     "artifactDefinitions",
@@ -33016,9 +32827,6 @@ function checkDeclaredPredicates(standard) {
   for (const s of standard.testSequences ?? []) {
     visit(`test_sequence ${s.id}`, s.refs);
   }
-  for (const c of standard.conditionSets ?? []) {
-    visit(`condition_set ${c.id}`, c.refs);
-  }
   for (const i of standard.instruments ?? []) {
     visit(`instrument ${i.id}`, i.refs);
   }
@@ -34940,65 +34748,8 @@ function renderJsonLd(prefixes, triples) {
 
 // src/export/retrieval.ts
 import { createHash } from "node:crypto";
-import { readdirSync as readdirSync5, readFileSync as readFileSync8, statSync as statSync4 } from "node:fs";
-import { join as join7, relative } from "node:path";
-
-// src/export/unitsdb.ts
-import { existsSync as existsSync6, readFileSync as readFileSync7 } from "node:fs";
-import { join as join6 } from "node:path";
-function loadUnitsDb(dir) {
-  if (!dir) {
-    return null;
-  }
-  try {
-    const entries = [];
-    const jsonPath = join6(dir, "units.json");
-    if (!existsSync6(jsonPath)) {
-      return null;
-    }
-    const parsed = JSON.parse(readFileSync7(jsonPath, "utf8")).units;
-    if (!Array.isArray(parsed)) {
-      return null;
-    }
-    for (const u of parsed) {
-      const identifiers = u.identifiers ?? [];
-      const unitsml = identifiers.find((i) => i.type === "unitsml")?.id;
-      if (!unitsml) {
-        continue;
-      }
-      const nist = identifiers.find((i) => i.type === "nist")?.id;
-      const scale = u.scale_reference?.id;
-      const symbols = (u.symbols ?? []).map((s) => String(s.ascii ?? s.id)).filter(Boolean);
-      const entry = {
-        unitsml,
-        ...nist ? { nist } : {},
-        ...scale ? { scale } : {},
-        symbols
-      };
-      entries.push(entry);
-    }
-    const bySymbol = /* @__PURE__ */ new Map();
-    const byUnitsml = /* @__PURE__ */ new Map();
-    const spellings = (s) => [
-      s,
-      s.replace(/\*([a-zA-ZμΩ°]+)\^-1\b/g, "/$1")
-    ];
-    for (const e of entries) {
-      byUnitsml.set(e.unitsml, e);
-      for (const s of e.symbols) {
-        for (const sp of spellings(s)) {
-          bySymbol.set(sp, e);
-        }
-      }
-    }
-    return { bySymbol, byUnitsml };
-  } catch {
-    return null;
-  }
-}
-function unitsDbEntryFor(db, unit) {
-  return db?.bySymbol.get(unit) ?? null;
-}
+import { readdirSync as readdirSync5, readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
+import { join as join6, relative } from "node:path";
 
 // src/export/yaml-lite.ts
 var NUMERIC2 = /^[-+]?(\d+\.?\d*|\.\d+)([eE][-+]?\d+)?$/;
@@ -35191,7 +34942,7 @@ function* walkPackage(dir) {
     if (entry === ".DS_Store") {
       continue;
     }
-    const p = join7(dir, entry);
+    const p = join6(dir, entry);
     if (statSync4(p).isDirectory()) {
       yield* walkPackage(p);
     } else {
@@ -35204,7 +34955,7 @@ function packageSourceHash(dir) {
   for (const file of walkPackage(dir)) {
     h.update(relative(dir, file));
     h.update("\0");
-    h.update(createHash("sha256").update(readFileSync8(file)).digest());
+    h.update(createHash("sha256").update(readFileSync7(file)).digest());
     h.update("\n");
   }
   return h.digest("hex");
@@ -35496,7 +35247,6 @@ var TEXT_ADDRESS_COLLECTIONS = [
   "attributeDefinitions",
   "capabilities",
   "behaviors",
-  "conditionSets",
   "subjects",
   "referenceMaterials",
   "artifactDefinitions",
@@ -35908,76 +35658,6 @@ function sequenceUnit(s) {
     collectClauses({ sourceRefs: s.sourceRefs, refs: s.refs })
   );
 }
-function conditionSetUnit(cs, registers, db = null) {
-  const unitsBySymbol = /* @__PURE__ */ new Map();
-  for (const reg of registers ?? []) {
-    const siUnitByKind = new Map(reg.kinds.map((k) => [k.id, k.siUnit]));
-    for (const u of reg.units ?? []) {
-      const siUnit = siUnitByKind.get(u.kind);
-      if (siUnit) {
-        unitsBySymbol.set(u.symbol, {
-          kind: u.kind,
-          factorToSI: u.factorToSI,
-          offsetToSI: u.offsetToSI,
-          siUnit
-        });
-      }
-    }
-  }
-  const siOf = (value, unit) => {
-    const def = unitsBySymbol.get(unit);
-    if (!def) {
-      return void 0;
-    }
-    const n = Number(String(value).replace(",", "."));
-    if (!Number.isFinite(n)) {
-      return void 0;
-    }
-    return { value: n * def.factorToSI + def.offsetToSI, unit: def.siUnit };
-  };
-  const payload = {
-    role: cs.role,
-    ...cs.subject ? { subject: cs.subject } : {},
-    entries: cs.entries.map((e) => {
-      const si = siOf(e.value, e.unit);
-      const ud = unitsDbEntryFor(db, e.unit);
-      return {
-        quantity_kind: e.quantityKind,
-        value: e.value,
-        unit: e.unit,
-        tolerance: e.tolerance,
-        ...si ? { si } : {},
-        ...ud ? {
-          unitsdb: {
-            unitsml: ud.unitsml,
-            ...ud.scale ? { scale: ud.scale } : {}
-          }
-        } : {},
-        ...e.note ? { note: e.note } : {}
-      };
-    })
-  };
-  return assemble(
-    {
-      id: `/condition/${cs.id}`,
-      kind: "condition_set",
-      name: cs.id,
-      statement: [
-        `${cs.role} condition set`,
-        ...cs.description ? [cs.description] : [],
-        ...cs.entries.map(
-          (e) => `${e.quantityKind.replace(/_/g, " ")}: ${e.value} ${e.unit} \xB1${e.tolerance}`
-        )
-      ].join(" \u2014 "),
-      payload
-    },
-    collectClauses({
-      sourceRefs: cs.sources,
-      refs: cs.refs,
-      source: cs.source
-    })
-  );
-}
 function noteUnit(n) {
   return assemble(
     {
@@ -36082,7 +35762,6 @@ function packageBlock(standard) {
   };
 }
 function exportStandardRetrieval(standard, options = {}) {
-  const unitsDb = loadUnitsDb(process.env.UNITSDB_DIR);
   const pkg = packageBlock(standard);
   const built = [];
   const push = (content, elementId) => {
@@ -36124,9 +35803,6 @@ function exportStandardRetrieval(standard, options = {}) {
   for (const s of standard.testSequences ?? []) {
     push(sequenceUnit(s), s.id);
   }
-  for (const cs of standard.conditionSets ?? []) {
-    push(conditionSetUnit(cs, standard.quantityRegisters, unitsDb), cs.id);
-  }
   for (const n of standard.notes ?? []) {
     push(noteUnit(n), n.id);
   }
@@ -36407,8 +36083,8 @@ function exportPackageImpact(dir) {
 }
 
 // src/export/cddal.ts
-import { readFileSync as readFileSync9, readdirSync as readdirSync6 } from "node:fs";
-import { basename, join as join8, resolve as resolve5 } from "node:path";
+import { readFileSync as readFileSync8, readdirSync as readdirSync6 } from "node:fs";
+import { basename, join as join7, resolve as resolve5 } from "node:path";
 var CDDAL_PROJECTION_VERSION = "primmel-cddal/1";
 function escapeCddalString(s) {
   return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
@@ -36554,23 +36230,23 @@ function projectCddal(model, packageId, l10n = /* @__PURE__ */ new Map()) {
 }
 function exportPackageCddal(dir) {
   const model = loadPackage(dir);
-  const l10nFiles = readdirSync6(dir).filter((e) => /^l10n\.[^/]+\.prl$/.test(e)).map((e) => join8(dir, e));
-  const l10n = readL10n(l10nFiles, (p) => readFileSync9(p, "utf8"));
+  const l10nFiles = readdirSync6(dir).filter((e) => /^l10n\.[^/]+\.prl$/.test(e)).map((e) => join7(dir, e));
+  const l10n = readL10n(l10nFiles, (p) => readFileSync8(p, "utf8"));
   return projectCddal(model, basename(resolve5(dir)), l10n);
 }
 
 // src/package-diff.ts
-import { existsSync as existsSync7, readdirSync as readdirSync7, readFileSync as readFileSync10 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync6, readdirSync as readdirSync7, readFileSync as readFileSync9 } from "fs";
+import { join as join8 } from "path";
 function packageMappings(dir, standard) {
   const profiles = [...standard.mapProfiles ?? []];
-  if (existsSync7(dir)) {
+  if (existsSync6(dir)) {
     for (const entry of readdirSync7(dir).sort()) {
       if (!entry.endsWith(".prm")) {
         continue;
       }
       profiles.push(
-        ...prmToMapProfiles(loadPrm(readFileSync10(join9(dir, entry), "utf8")))
+        ...prmToMapProfiles(loadPrm(readFileSync9(join8(dir, entry), "utf8")))
       );
     }
   }
@@ -36579,8 +36255,8 @@ function packageMappings(dir, standard) {
 }
 function packageClauseTexts(dir) {
   const out = /* @__PURE__ */ new Map();
-  const prdDir = join9(dir, "sources-prd");
-  if (!existsSync7(prdDir)) {
+  const prdDir = join8(dir, "sources-prd");
+  if (!existsSync6(prdDir)) {
     return out;
   }
   for (const entry of readdirSync7(prdDir).sort()) {
@@ -36589,7 +36265,7 @@ function packageClauseTexts(dir) {
     }
     let payload;
     try {
-      payload = JSON.parse(readFileSync10(join9(prdDir, entry), "utf8"));
+      payload = JSON.parse(readFileSync9(join8(prdDir, entry), "utf8"));
     } catch {
       continue;
     }
@@ -36650,7 +36326,7 @@ function readablePackageDirProblem(target, needsManifest) {
     const err = e;
     return err.code === "ENOENT" ? "no such directory" : err.message;
   }
-  if (needsManifest && !existsSync8(join10(target, "package.primmel"))) {
+  if (needsManifest && !existsSync7(join9(target, "package.primmel"))) {
     return "no package.primmel found";
   }
   return null;
@@ -36891,7 +36567,7 @@ function fmtCli(argv) {
   const check = argv.includes("--check");
   const rest = argv.filter((a) => a !== "--check");
   const dir = rest[rest.length - 1];
-  if (!dir || !existsSync8(dir)) {
+  if (!dir || !existsSync7(dir)) {
     console.error(`cannot read package at ${dir || "(none)"}: no such directory`);
     process.exit(2);
   }

package/package.json

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