glossarist 0.4.26 → 0.4.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glossarist",
-  "version": "0.4.26",
+  "version": "0.4.27",
   "description": "JavaScript SDK for Glossarist GCR packages — read, write, validate, and manage terminology concepts",
   "type": "module",
   "main": "src/index.js",

package/src/diff/diff-renderer.js

@@ -198,6 +198,16 @@ function definitionLabel(d) {
   return d.content ?? '?';
 }
 
+import { multiplicityFromPair } from '../models/multiplicity.js';
+
+function _resolveMultiplicity(m) {
+  if (m?.presence && m?.count) {
+    try { return multiplicityFromPair(m.presence, m.count); }
+    catch { return 'compulsory'; }
+  }
+  return m?.multiplicity ?? 'compulsory';
+}
+
 function relationLabel(r) {
   if (!r) return '?';
   const c = r.comprehensive;
@@ -206,7 +216,7 @@ function relationLabel(r) {
     ? r.partitives.map(m => {
         const ref = m?.ref ?? m ?? {};
         let tail = '';
-        const mult = m?.multiplicity;
+        const mult = _resolveMultiplicity(m);
         if (mult && mult !== 'compulsory') tail = ` (${mult})`;
         if (m?.is_delimiting === true) tail += ' ⊘';
         return `${ref.id ?? ref.source ?? ref.text ?? '?'}${tail}`;
@@ -236,7 +246,7 @@ export function multiplicityStats(relations) {
   for (const rel of relations ?? []) {
     for (const m of rel?.partitives ?? []) {
       total += 1;
-      const mult = m?.multiplicity ?? 'compulsory';
+      const mult = _resolveMultiplicity(m);
       byMultiplicity[mult] = (byMultiplicity[mult] ?? 0) + 1;
       const p = m?.presence ?? 'required';
       const c = m?.count ?? 'exactly_one';

package/src/migration/partitive-relation-migrator.js

@@ -8,7 +8,7 @@
 // ISO 704:2022 correction):
 //
 //   comprehensive      → comprehensive     (unchanged shape)
-//   parts: [ref, ...]  → partitives: [{ ref, multiplicity: 'compulsory' }, ...]
+//   parts: [ref, ...]  → partitives: [{ ref, presence: 'required', count: 'exactly_one' }, ...]
 //   enumeration: open  → completeness: partial
 //   enumeration: closed→ completeness: complete
 //   markers: [...]     → (dropped — v2 uses per-member multiplicity

package/src/rdf/gloss-partitive-member.js

@@ -21,6 +21,7 @@
 
 import { PRED } from './predicates.js';
 import { namedNode, literal, quad } from './terms.js';
+import { multiplicityFromPair } from '../models/multiplicity.js';
 
 // SKOS taxonomy namespaces (concept-model will ship these taxonomies).
 // Until then, the URIs are forward-compatible and resolve once the
@@ -45,11 +46,16 @@ export function* partitiveMemberToQuads(member, { memberUri }) {
     );
   }
   // Derived multiplicity URI for v3 RDF consumer backward compat.
-  // multiplicity is computed from (presence, count) via the model's
-  // accessor; fall back to the raw field for raw JSON input.
-  const mult = typeof member?.multiplicity === 'string'
-    ? member.multiplicity
-    : null;
+  // v4 PartitiveMember no longer exposes .multiplicity — compute from
+  // presence + count via multiplicityFromPair. Accept raw JSON that
+  // still carries a literal multiplicity field for pre-v4 data.
+  let mult = null;
+  if (member?.presence && member?.count) {
+    try { mult = multiplicityFromPair(member.presence, member.count); }
+    catch { /* invalid combination — skip derived emission */ }
+  } else if (typeof member?.multiplicity === 'string') {
+    mult = member.multiplicity;
+  }
   if (mult) {
     yield quad(
       namedNode(memberUri),