strom-research 1.22.2 → 1.23.0-beta.2

package/dist/core/tree.js

@@ -29,7 +29,7 @@ export const TREE_FILE = "strom.json";
 export const SEAL_FOREIGN = "seal.foreign";
 // 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.22.2";
+export const VERSION = "1.23.0-beta.2";
 const GITIGNORE = `# Strom Research — local state and large files are not versioned
 .strom/
 /media/

package/dist/core/validate.js

@@ -200,8 +200,12 @@ function checkPerson(p, out) {
                     out.push({ path: `names[${i}].${t}`, message: "must be a title (a string, not empty)" });
             if (n.kind !== undefined && !NAME_KINDS.includes(n.kind))
                 out.push({ path: `names[${i}].kind`, message: `must be one of ${NAME_KINDS.join(", ")}` });
+            if (n.primary !== undefined && n.primary !== true)
+                out.push({ path: `names[${i}].primary`, message: "must be true, or left out" });
             checkCitations(n.citations, `names[${i}].citations`, out);
         });
+    if (Array.isArray(p.names) && p.names.filter((n) => isObj(n) && n.primary).length > 1)
+        out.push({ path: "names", message: "at most one name is the one the person is shown by (primary)" });
     if (p.retractedNames !== undefined) {
         if (!Array.isArray(p.retractedNames))
             out.push({ path: "retractedNames", message: "must be an array" });

package/dist/gedcom/export.js

@@ -27,7 +27,7 @@
 import { GedWriter, clipChars, lineValue } from "./lines.js";
 import { labels, RELA } from "./labels.js";
 import { linkInTree, recordedLinks } from "../core/hypolinks.js";
-import { birthEvent, claimText, conflictTitle, coupleSides, displayName, familySides, formatName, gedcomTitledName, noName, preferredOrder, primaryName, relationTo } from "../core/people.js";
+import { birthEvent, claimText, conflictTitle, coupleSides, currentName, displayName, familySides, formatName, gedcomTitledName, noName, preferredOrder, primaryName, relationTo } from "../core/people.js";
 import { foldText } from "../core/text.js";
 import { dateYears } from "../core/gdate.js";
 import { humanAge, isGedcomAge, normalizeAge } from "../core/age.js";
@@ -258,7 +258,17 @@ export function exportGedcom(tree, opts = {}) {
         w.record(x(p.id), "INDI");
         const primary = primaryName(p);
         const nameQuotes = [];
-        for (const n of [primary, ...p.names.filter((n) => n !== primary)]) {
+        // the name the person is shown by now (Name.primary): first for any program (GEDCOM 7: the preferred name first);
+        // the Strom file keeps the name of their identity first (the app's birth surname) and says the mark — a married
+        // name marked last of them (the app keeps one name after a marriage: the last), so even an app that reads no mark
+        // shows it
+        const current = currentName(p);
+        const rest = p.names.filter((n) => n !== primary && n !== current);
+        const order = current === primary ? [primary, ...rest]
+            : strict ? [current, primary, ...rest]
+                : current.kind === "married" ? [primary, ...rest, current]
+                    : [primary, ...p.names.filter((n) => n !== primary)];
+        for (const n of order) {
             // a name with a title says it in the line (any program shows it) and spells its parts out below: NPFX, GIVN, SURN,
             // NSFX — for any program (GEDCOM 5.5.1's own tags), for the Strom app from its 3.10 (titles; an older one reads
             // the line). A part holding a comma gets no GIVN / SURN (GEDCOM reads commas there as a list); the line has it.
@@ -280,6 +290,8 @@ export function exportGedcom(tree, opts = {}) {
             // "birth" says something only next to another name
             if (n.kind && (n.kind !== "birth" || p.names.length > 1))
                 w.line(2, "TYPE", NAME_TYPE[n.kind]);
+            if (!strict && n.primary)
+                w.line(2, "_STROM_PRIMARY", "Y");
             for (const c of n.citations ?? []) {
                 const q = citation(2, c);
                 if (q)

package/dist/gedcom/validate.js

@@ -5,7 +5,7 @@ import { normalizeDate } from "../core/gdate.js";
 import { isGedcomAge } from "../core/age.js";
 import { MAX_LINE_BYTES } from "./lines.js";
 const LINE = /^(\d{1,2}) (?:(@[^@ ]+@) )?([A-Za-z0-9_]+)(?: (.*))?$/;
-const EVENT_DETAIL = ["TYPE", "DATE", "PLAC", "AGE", "SOUR", "NOTE", "ASSO", "_WITN", "CAUS", "ADDR", "AGNC", "RELI", "OBJE", "HUSB", "WIFE"];
+const EVENT_DETAIL = ["TYPE", "DATE", "PLAC", "AGE", "SOUR", "NOTE", "ASSO", "_WITN", "CAUS", "ADDR", "AGNC", "RELI", "OBJE", "HUSB", "WIFE", "_STROM_STATUS"];
 const INDI_EVENTS = [
     "BIRT", "DEAT", "BAPM", "CHR", "CHRA", "CONF", "FCOM", "BARM", "BASM", "ORDN", "EDUC", "GRAD", "OCCU", "RESI", "EMIG", "IMMI",
     "NATU", "RELI", "TITL", "NATI", "ADOP", "WILL", "PROB", "BURI", "CREM", "CENS", "EVEN", "RETI", "BLES", "CAST", "DSCR", "IDNO",
@@ -14,7 +14,7 @@ const INDI_EVENTS = [
 const FAM_EVENTS = ["MARR", "DIV", "MARB", "MARC", "MARL", "MARS", "ANUL", "DIVF", "ENGA", "CENS", "RESI", "EVEN", "NCHI"];
 /** Allowed child tags by parent context ("INDI", "INDI.BIRT", …). CONC/CONT are allowed under anything with text. */
 const CHILDREN = {
-    HEAD: ["SOUR", "DEST", "DATE", "SUBM", "SUBN", "FILE", "COPR", "GEDC", "CHAR", "LANG", "PLAC", "NOTE", "_STROM_TREE", "_STROM_HEAD", "_STROM_LINKS", "_STROM_ASOF"],
+    HEAD: ["SOUR", "DEST", "DATE", "SUBM", "SUBN", "FILE", "COPR", "GEDC", "CHAR", "LANG", "PLAC", "NOTE", "_STROM_TREE", "_STROM_HEAD", "_STROM_LINKS", "_STROM_ASOF", "_STROM_MODE"],
     "HEAD.SOUR": ["VERS", "NAME", "CORP", "DATA"],
     "HEAD._STROM_LINKS": ["_SCHEME"],
     "HEAD.GEDC": ["VERS", "FORM"],
@@ -33,14 +33,16 @@ const CHILDREN = {
     "_STROM_EDGE._JOIN": ["_VAR", "_ISLAND", "_HELD"],
     // a value of a conflict the app decides by side: its side, a sex as M, F or U
     _STROM_VALUE: ["SOUR", "_STROM_SIDE", "_STROM_RAW"],
-    "INDI.NAME": ["TYPE", "GIVN", "SURN", "NPFX", "NSFX", "NICK", "SPFX", "SOUR", "NOTE"],
+    "INDI.NAME": ["TYPE", "GIVN", "SURN", "NPFX", "NSFX", "NICK", "SPFX", "SOUR", "NOTE", "_STROM_PRIMARY"],
     "INDI.FAMC": ["PEDI", "NOTE"],
     "INDI.FAMS": ["NOTE"],
     "FAM.CHIL": ["_FREL", "_MREL"],
     "INDI.ASSO": ["RELA", "SOUR", "NOTE"],
-    FAM: ["HUSB", "WIFE", "CHIL", "NOTE", "SOUR", "REFN", "OBJE", "RIN", "CHAN", "_STORY", ...FAM_EVENTS],
+    FAM: ["HUSB", "WIFE", "CHIL", "NOTE", "SOUR", "REFN", "OBJE", "RIN", "CHAN", "_STORY", "_STAT", "_STROM_NO_COUPLE", ...FAM_EVENTS],
     // the Strom profile also writes PAGE on the record: where in the book the source is (the Strom app's reference)
-    SOUR: ["TITL", "AUTH", "ABBR", "PUBL", "TEXT", "REPO", "NOTE", "REFN", "DATA", "OBJE", "RIN", "CHAN"],
+    SOUR: ["TITL", "AUTH", "ABBR", "PUBL", "TEXT", "REPO", "NOTE", "REFN", "DATA", "OBJE", "RIN", "CHAN", "_STROM_READ", "_STROM_VERIFIED", "_STROM_READING", "_STROM_IMG_OMITTED"],
+    "SOUR._STROM_READING": ["_STROM_ENTRY"],
+    "SOUR._STROM_IMG_OMITTED": ["_STROM_CLIP"],
     "SOUR.REPO": ["CALN", "NOTE"],
     REPO: ["NAME", "ADDR", "NOTE", "REFN", "RIN", "CHAN"],
     SUBM: ["NAME", "ADDR", "LANG", "NOTE", "RIN", "CHAN"],
@@ -73,6 +75,12 @@ const EXTENSIONS = new Set([
     "_VAR", "_LINK", "_PERS", "_FAM", "_PAR", "_CHOSEN", "_INTREE",
     // a source's excerpts the file leaves out, and why
     "_STROM_IMG_OMITTED",
+    // the name a person is shown by; a couple's state; parents who are no couple; an archive
+    "_STROM_PRIMARY", "_STAT", "_STROM_NO_COUPLE", "_STROM_MODE",
+    // who read a source, the user's verification, the reading it is an entry of; how sure a fact is
+    "_STROM_READ", "_STROM_VERIFIED", "_STROM_READING", "_STROM_ENTRY", "_STROM_STATUS",
+    // an excerpt's original by its content, and how its picture lies
+    "_STROM_SHA", "_STROM_ORIENT",
 ]);
 /** Context of the children of the last tag in `anc` (the ancestors of a line). */
 function contextOf(anc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strom-research",
-  "version": "1.22.2",
+  "version": "1.23.0-beta.2",
   "description": "Genealogical research toolkit for AI coding agents",
   "type": "module",
   "bin": {
@@ -57,5 +57,8 @@
   "devDependencies": {
     "@types/node": "^22.20.4",
     "typescript": "^7.0.2"
+  },
+  "publishConfig": {
+    "tag": "beta"
   }
 }