compasso 0.4.0 → 0.5.0

package/dist/genogram/index.cjs

@@ -149,6 +149,32 @@ function qualityLineStyle(quality, lexicon = QUALITY_LEXICON_EN) {
   return matched.length === 1 ? matched[0] : "plain";
 }
 
+// src/core/annotation.ts
+var round = (n) => Math.round(n * 100) / 100;
+var ANNOTATION_INK = "#52525b";
+var DOT_R = 3;
+var TICK_HALF = 3;
+function annotationDot(cx, cy) {
+  return `<circle cx="${round(cx)}" cy="${round(cy)}" r="${DOT_R}" fill="${ANNOTATION_INK}" fill-opacity="0.6"/>`;
+}
+function annotationTick(points) {
+  if (points.length < 2) return "";
+  const i = Math.floor((points.length - 1) / 2);
+  const a = points[i];
+  const b = points[i + 1] ?? points[i];
+  const mx = (a.x + b.x) / 2;
+  const my = (a.y + b.y) / 2;
+  const horizontal = Math.abs(a.y - b.y) <= Math.abs(a.x - b.x);
+  const x1 = horizontal ? mx : mx - TICK_HALF;
+  const x2 = horizontal ? mx : mx + TICK_HALF;
+  const y1 = horizontal ? my - TICK_HALF : my;
+  const y2 = horizontal ? my + TICK_HALF : my;
+  return `<line x1="${round(x1)}" y1="${round(y1)}" x2="${round(x2)}" y2="${round(y2)}" stroke="${ANNOTATION_INK}" stroke-width="1.5"/>`;
+}
+function annotationSwatch(x, yCenter) {
+  return annotationDot(x + LEGEND_SWATCH_W / 2, yCenter);
+}
+
 // src/genogram/kinship.ts
 var KINSHIP_EN = {
   derived: /* @__PURE__ */ new Set([
@@ -283,7 +309,8 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
     parentId: l.parentId,
     childId: l.childId,
     quality: l.quality,
-    edgeId: PARENT_REL_ID_BASE + l.id
+    edgeId: PARENT_REL_ID_BASE + l.id,
+    annotated: l.annotated ?? false
   }));
   const declaredPairs = new Set(validLinks.map((l) => pairKey(l.parentId, l.childId)));
   const promotedByPair = /* @__PURE__ */ new Map();
@@ -302,7 +329,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
       [parentId, childId] = fromIsChild ? [r.toPersonId, r.fromPersonId] : [r.fromPersonId, r.toPersonId];
     }
     if (parentId === childId) continue;
-    promotedByPair.set(key, { parentId, childId, quality: r.quality, edgeId: PROMOTED_REL_ID_BASE + r.id });
+    promotedByPair.set(key, { parentId, childId, quality: r.quality, edgeId: PROMOTED_REL_ID_BASE + r.id, annotated: r.annotated ?? false });
   }
   const allLinks = [...realLinks, ...promotedByPair.values()].sort((a, b) => a.edgeId - b.edgeId);
   const coupleByPair = /* @__PURE__ */ new Map();
@@ -635,6 +662,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
         toPersonId: u.personBId,
         titles: [unionTitle(u)],
         lineStyle: "plain",
+        annotated: u.annotated ?? false,
         build: () => {
           const cy = geo.cy(rowOfPerson.get(leftId));
           if (dipLevel === 0) {
@@ -669,6 +697,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
         toPersonId: u.personBId,
         titles: [unionTitle(u)],
         lineStyle: "plain",
+        annotated: u.annotated ?? false,
         build
       });
     }
@@ -725,6 +754,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
       };
       gutterReqs.push(spineReq);
       const aId = (c) => linkOf.get(`${u.personAId}>${c}`).edgeId;
+      const aLinkAnnotated = (c) => linkOf.get(`${u.personAId}>${c}`).annotated ?? false;
       const childDrop = (c, parentId) => {
         const link = linkOf.get(`${parentId}>${c}`);
         const edgeId = link.edgeId;
@@ -737,6 +767,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
           toPersonId: c,
           titles: [linkTitle(link)],
           lineStyle: "plain",
+          annotated: link.annotated,
           build: () => {
             const y = geo.corridorLaneY(sibReq);
             const x = geo.cx(colOrThrow(c)) + arrivalOffset(arr.slot, arrivalCount.get(c) ?? 1);
@@ -757,6 +788,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
           toPersonId: null,
           titles: [linkTitle(linkOf.get(`${u.personAId}>${c}`))],
           lineStyle: "plain",
+          annotated: aLinkAnnotated(c),
           build: () => {
             const sy = geo.corridorLaneY(sibReq);
             const sx = geo.gutterCenterX(interGutter);
@@ -782,6 +814,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
           // declared quality word is dropped from the drawn element (FIX C-2 / SPEC inv #4).
           titles: [aLinkTitle(groupKids[0]), ...groupKids.slice(2).map(aLinkTitle)],
           lineStyle: "plain",
+          annotated: [groupKids[0], ...groupKids.slice(2)].some(aLinkAnnotated),
           build: () => {
             const y = geo.corridorLaneY(sibReq);
             const xs = sibSpan();
@@ -800,6 +833,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
           titles: [aLinkTitle(groupKids[1])],
           // the A-side link this spine carries, verbatim
           lineStyle: "plain",
+          annotated: aLinkAnnotated(groupKids[1]),
           build: () => {
             const sy = geo.corridorLaneY(sibReq);
             const x = geo.gutterCenterX(interGutter);
@@ -827,6 +861,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
       titles: [linkTitle(l)],
       lineStyle: "plain",
       dotted: true,
+      annotated: l.annotated,
       build
     });
   }
@@ -839,10 +874,11 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
     const title = r.quality !== null ? `${r.type} \xB7 ${r.quality}` : r.type;
     const g = bondGroups.get(key);
     if (g === void 0) {
-      bondGroups.set(key, { relIds: [r.id], titles: [title], style, aId: r.fromPersonId, bId: r.toPersonId });
+      bondGroups.set(key, { relIds: [r.id], titles: [title], style, aId: r.fromPersonId, bId: r.toPersonId, annotated: r.annotated ?? false });
     } else {
       g.relIds.push(r.id);
       g.titles.push(title);
+      if (r.annotated) g.annotated = true;
     }
   }
   const bondList = [...bondGroups.values()].sort((a, b) => Math.max(...a.relIds) - Math.max(...b.relIds));
@@ -861,6 +897,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
       toPersonId: g.bId,
       titles: g.titles,
       lineStyle: g.style,
+      annotated: g.annotated,
       build
     });
   }
@@ -957,6 +994,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
       label: p.label,
       shape: shapeForSex(p.sex),
       deceased: p.deceased,
+      annotated: p.annotated ?? false,
       cx: colCenterX[c],
       cy: rowCenterY[r],
       size: NODE_SIZE,
@@ -973,6 +1011,7 @@ function computeGenogramLayout(people, unions, parentLinks, relationships, opts
     points: pl.build(),
     titles: pl.titles,
     lineStyle: pl.lineStyle,
+    annotated: pl.annotated,
     ...pl.unionStyle !== void 0 ? { unionStyle: pl.unionStyle } : {},
     ...pl.dotted ? { dotted: true } : {}
   }));
@@ -1077,6 +1116,7 @@ function elementSvg(el, override) {
     }
     return `<path d="${pathData(pts)}" fill="none" stroke="${EDGE_INK}" stroke-width="${width}" stroke-opacity="${opacity}"${dashAttr}/>`;
   };
+  const tick = el.annotated ? annotationTick(el.points) : "";
   if (el.kind === "union-bar" || el.kind === "union-elbow") {
     const style = resolveUnionStyle(el, override);
     const body = [drawLine(style.dash ?? null, STRUCT_WIDTH, STRUCT_OPACITY)];
@@ -1085,15 +1125,15 @@ function elementSvg(el, override) {
       const [a, b] = pts.length === 2 ? [pts[0], pts[1]] : longestHSegment(pts);
       body.push(slashMarks(a, b, slashes, STRUCT_WIDTH));
     }
-    return `<g data-edge-id="${el.edgeId}">${title}${body.join("")}</g>`;
+    return `<g data-edge-id="${el.edgeId}">${title}${body.join("")}${tick}</g>`;
   }
   if (el.kind === "descent" || el.kind === "sibling-bar") {
     const dash = el.dotted ? DOTTED_DASH : null;
     const opacity = el.dotted ? DOTTED_OPACITY : STRUCT_OPACITY;
-    return `<g data-edge-id="${el.edgeId}">${title}${drawLine(dash, STRUCT_WIDTH, opacity)}</g>`;
+    return `<g data-edge-id="${el.edgeId}">${title}${drawLine(dash, STRUCT_WIDTH, opacity)}${tick}</g>`;
   }
   const ink = EDGE_STROKE[el.lineStyle];
-  return `<g data-edge-id="${el.edgeId}">${title}${drawLine(ink.dash, ink.width, ink.opacity)}</g>`;
+  return `<g data-edge-id="${el.edgeId}">${title}${drawLine(ink.dash, ink.width, ink.opacity)}${tick}</g>`;
 }
 function genogramLayoutSvg(layout, opts = {}) {
   const override = opts.unionStyleByRelId ?? /* @__PURE__ */ new Map();
@@ -1111,6 +1151,9 @@ function genogramLayoutSvg(layout, opts = {}) {
         `<line x1="${node.cx - half}" y1="${node.cy - half}" x2="${node.cx + half}" y2="${node.cy + half}" stroke="${GLYPH_STROKE}" stroke-width="2"/>`
       );
     }
+    if (node.annotated) {
+      pieces.push(annotationDot(node.cx + 0.7 * half, node.cy - 0.7 * half));
+    }
     const tspans = node.labelLines.map(
       (line, i) => `<tspan x="${node.cx}" y="${node.labelTop + 10 + i * LABEL_LINE_H}">${xmlEscape(line)}</tspan>`
     ).join("");
@@ -1153,6 +1196,12 @@ function genogramLayoutSvg(layout, opts = {}) {
         label: labels.isolated
       });
     }
+    if (opts.annotationLabel !== void 0 && (layout.nodes.some((n) => n.annotated) || layout.elements.some((e) => e.annotated))) {
+      entries.push({
+        swatch: (x, y) => annotationSwatch(x, y),
+        label: opts.annotationLabel
+      });
+    }
     const block = legendBlock(entries, layout.height);
     if (block.svg !== "") {
       parts.push(block.svg);
@@ -1204,7 +1253,8 @@ function genogramSvg(input, opts = {}) {
   const svg = genogramLayoutSvg(layout, {
     unionStyleByRelId,
     ...opts.legend === false ? { legend: false } : {},
-    ...opts.svgLabels !== void 0 ? { labels: opts.svgLabels } : {}
+    ...opts.svgLabels !== void 0 ? { labels: opts.svgLabels } : {},
+    ...opts.annotationLabel !== void 0 ? { annotationLabel: opts.annotationLabel } : {}
   });
   return { svg, layout };
 }