strom-research 1.13.2-beta.1 → 1.13.2-beta.2

package/dist/core/sync.js

@@ -668,6 +668,8 @@ const APP_COUPLE_EVENTS = {
 };
 /** Facts whose value is what they are (the GEDCOM tag's value). */
 const VALUE_KINDS = new Set(["OCCU", "RELI", "TITL", "NATI"]);
+/** A fact that is its value (an occupation, a religion) without one: no fact — its value taken off in the app (B-1). */
+const bare = (f) => VALUE_KINDS.has(kindOf(f.kind)) && !f.value?.trim();
 /** A tree of the Strom app (its JSON) as a snapshot. */
 export function readStromJson(data) {
     const d = data;
@@ -1918,8 +1920,20 @@ export function planSync(tree, incoming, edits, opts = {}) {
             }
             const less = our.find((o) => knowsMore(o, f));
             if (less) {
-                // the file knows less of it (the date lost on the way)
+                // the file knows less of it (the date lost on the way) — or, against what the app was given, the user took a
+                // part of it off, the fact itself kept (B-1, found with the app's 3.11.0-beta.2: a proven death's date taken off,
+                // "not written 1", no conflict): its date, place or value as given, the research's still. A record's fact: the
+                // user's to decide (empty where nothing is left); a lead corrected. Without a base nothing is taken off (an
+                // older copy, another program: what it lacks it may never have had)
                 partsDiff(f, less);
+                const given = less.id && !used.has(factKey(less)) ? was?.find((b) => factKey(b) === factKey(less) && (!b.id || b.id === less.id)) : undefined;
+                const off = given ? ["date", "place", "value"].filter((k) => !!exact(given[k]) && !exact(f[k])) : [];
+                if (off.length) {
+                    used.add(factKey(less));
+                    const action = recordBacked(tree, eventById(tree, less.id)) ? edits : "correct";
+                    if (action !== "conflict" || !openConflict(tree, owner.person ?? owner.family, f))
+                        push({ kind: "fact.changed", action, ...owner, fact: f, was: less, off });
+                }
                 continue;
             }
             if (was && baseKeys.has(k)) {
@@ -2858,7 +2872,7 @@ function addsTo(ours, file) {
 }
 /** An open conflict whose claims hold this value for the person or family already. */
 function openConflict(tree, owner, f) {
-    return openClaim(tree, owner, describe(f));
+    return openClaim(tree, owner, claimValue(f));
 }
 function openClaim(tree, owner, value) {
     if (!owner)
@@ -3182,7 +3196,13 @@ export function applySync(tree, plan, incoming, source, only) {
                         toVerify(owner, given);
                     }
                     else if (c.action === "correct" || (c.kind === "fact.differs" && c.action === "pick" && !recordBacked(tree, mine))) {
-                        editEvent(tree, mine.id, { date: c.fact.date ?? "", place: c.fact.place ?? "", ...(c.fact.value !== undefined ? { value: c.fact.value } : {}) }, `corrected in ${reason}`);
+                        // a value the user took off goes (B-1); a fact that is its value (an occupation) goes with it
+                        if (bare(c.fact)) {
+                            retractEvent(tree, mine.id, `corrected in ${reason}`);
+                            applied.push({ do: "event.retract", id: mine.id, before: mine.status });
+                            break;
+                        }
+                        editEvent(tree, mine.id, { date: c.fact.date ?? "", place: c.fact.place ?? "", ...(c.fact.value !== undefined ? { value: c.fact.value } : c.off?.includes("value") ? { value: "" } : {}) }, `corrected in ${reason}`);
                         // cited: the sources the user gave it in the app, else the sync — a family tree that gave the old value (a file
                         // taken in, an earlier send) says it no more: its citation goes, kept for an undo (found on Mac: "S0001:
                         // kovář" in a conflict, the file saying mlynář)
@@ -3200,6 +3220,8 @@ export function applySync(tree, plan, incoming, source, only) {
                     else if (c.action === "user") {
                         retractEvent(tree, mine.id, `the user's edit wins: ${reason}`);
                         applied.push({ do: "event.retract", id: mine.id, before: mine.status });
+                        if (bare(c.fact))
+                            break;
                         // the user's word: no record makes it probable — unless it is their reading of one, which counts
                         const citations = theirs.length ? theirs : [cite(c.fact.kind)];
                         const { event } = addEvent(tree, owner, { ...fields(c.fact), status: citations.some((x) => reading(x.source)) ? "probable" : "possible", citations });
@@ -3210,7 +3232,7 @@ export function applySync(tree, plan, incoming, source, only) {
                         const title = editTitle(c.name ?? owner, eventName(c.fact.kind, tree.lang, c.fact.label), factWords(tree, incoming, mine), factWords(tree, incoming, c.fact));
                         conflictOfEdit(tree, applied, owner, c.fact.kind, title, [
                             { ...(mine.citations[0] ? { source: mine.citations[0].source } : {}), value: describe(mine), note: `the research: ${mine.id}`, text: factWords(tree, incoming, mine) },
-                            { source: source.id, value: describe(c.fact), note: "the user's edit", text: factWords(tree, incoming, c.fact) },
+                            { source: source.id, value: claimValue(c.fact), note: "the user's edit", text: factWords(tree, incoming, c.fact) },
                         ], { event: mine.id, ...(c.fact.date ? { date: c.fact.date } : {}), ...(c.fact.place ? { place: c.fact.place } : {}), ...(c.fact.value ? { value: c.fact.value } : {}), ...(theirs.length ? { cites: theirs } : {}) });
                     }
                     break;
@@ -3754,6 +3776,11 @@ function describe(f) {
     const ages = Object.entries(f.ages ?? {}).map(([who, a]) => `${who} aged ${a}`);
     return [f.value, f.date, f.place, f.house && `house ${f.house}`, f.age && `aged ${f.age}`, ...ages, f.cause && `cause ${f.cause}`].filter(Boolean).join(", ") || "—";
 }
+/** A fact as a claim of a conflict of the user's edit holds it: nothing left of it (B-1: its date and place taken off) empty. */
+function claimValue(f) {
+    const said = describe(f);
+    return said === "—" ? "" : said;
+}
 /**
  * The title of a conflict of the user's edit, in the research's language — the Strom app shows it in what the research
  * knows (found on Mac: "Petr Svoboda: SEX — U × F" in a Czech research): "Petr Svoboda: Pohlaví — neznámé × žena".
@@ -3840,6 +3867,11 @@ export function takeSide(tree, x, side, reason) {
     const user = x.claims.find((c) => c.note === "the user's edit");
     // where the user's value came from: the sources they gave it in the app (where in them), and their edits' source
     const cited = [...(x.edit.cites ?? []), ...(user?.source && tree.get(user.source)?.type === "source" ? [{ source: user.source, locator: mine.kind }] : [])].filter((c, i, all) => !!tree.get(c.source) && all.findIndex((y) => y.source === c.source) === i);
+    // a fact that is its value (an occupation) with the value taken off is no fact: withdrawn, nothing in its place (B-1)
+    if (bare({ kind: mine.kind, ...(x.edit.value ? { value: x.edit.value } : {}) })) {
+        retractEvent(tree, mine.id, `the user's edit wins (${x.id}): ${reason}`);
+        return `${mine.id} withdrawn`;
+    }
     if (recordBacked(tree, mine)) {
         retractEvent(tree, mine.id, `the user's edit wins (${x.id}): ${reason}`);
         const { event } = addEvent(tree, owner, { kind: mine.kind, ...(x.edit.date ? { date: x.edit.date } : {}), ...(x.edit.place ? { place: x.edit.place } : {}), ...(x.edit.value ? { value: x.edit.value } : {}), ...(mine.label ? { label: mine.label } : {}), status: "possible", citations: cited });

package/dist/core/tree.js

@@ -27,7 +27,7 @@ import { lastBackup } from "./backup.js";
 export const TREE_FILE = "strom.json";
 // between releases the candidate being made (a bridge run from the sources says what it is: the Strom app goes by it);
 // at a release the release's own (package.json)
-export const VERSION = "1.13.2-beta.1";
+export const VERSION = "1.13.2-beta.2";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.13.2-beta.1",
+  "version": "1.13.2-beta.2",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "bin": {