@finbheara/archive-client 0.12.0 → 0.13.0

package/README.md

@@ -194,14 +194,19 @@ A release holds a feis-year once its results are captured and carries no calenda
 ```ts
 const a = await rel.schools.resolve("Ardvarna Academy of Irish Dance (Calgary, AB)", { region: "WCRO" });
 a.arm;          // "unique" | "ambiguous" | "none"
-a.candidates;   // [{ school_id, display, rows, by, prints, regions, places }]
+a.candidates;   // [{ school_id, display, rows, by, prints, regions, places, years? }]
 ```
 
 The rungs, the first that answers wins: a school id, a retired id followed to the live one, the
 print exactly as the release published it, then the print read by `@finbheara/domain`'s school
 reader at its filing key (`sn3`) and at its real words. `ambiguous` and `none` are answers: a
 best guess is never promoted to `unique`. `region` drops only a candidate the registry places in
-other regions, and keeps one it places nowhere. A print the reader refuses (a placeholder)
+other regions, and keeps one it places nowhere. `year` reads a print at that year, on a print
+rung only: where the print reaches two or more ids, the ids whose rows printed it that year are
+kept (a print one school took over from another names the one that held it then), else the ids
+that printed it last before that year, and where the year is before every one of them, all stay
+(`a.year`: `{ asked, narrowed }`, each candidate's `years: { lo, hi }`). A dancer question reads
+its school print at its own year. A print the reader refuses (a placeholder)
 answers `none` with the reason. An id (or a retired id followed) answers with every print its
 rows were published under and their rows, so it agrees with each print lookup of that school.
 
@@ -262,8 +267,8 @@ year with the asked age, or a dancer the release publishes in the other populati
 majors solo competitions and in none of the asked one's (listed in `excluded`, `why: "age"` or
 `"population"`, and a candidate contradicting both says `age`). A dancer published in both, or in
 neither, stays. A population word that names no one population (`mixed`) narrows nothing, and the
-answer says so (`r.population.note`). The school is evidence and order, never a reason
-to drop anyone: candidates whose latest school is the asked one, or one the lineage joins to it,
+answer says so (`r.population.note`). Outside the narrowing below, the school is evidence and
+order, never a reason to drop anyone: candidates whose latest school is the asked one, or one the lineage joins to it,
 come first, then those that ever danced for it, then the rest. A school row meets the asked school by its id, else by its print
 (one `rel.schools` resolves to the asked ids), so a latest print the release
 filed under no id is still `same`. `unique` is one candidate left after the age, never a best
@@ -297,8 +302,31 @@ words):
 one candidate is open and the age did not set it aside: the candidates the school refuted then
 move to `excluded` (`why: "school"`). Otherwise the arm stays `ambiguous` with every candidate,
 and where the school and the region single out no one, `preferred` names the only open candidate
-with a row in the asked year or the year before. A full given name is never narrowed this way: two
-full given names that differ are two names, and the school only orders them.
+with a row in the asked year or the year before.
+
+A FULL GIVEN NAME with a school the release resolves is narrowed the same way (`r.fullName`, the
+same shape as `r.initials`), with one more hard fact:
+
+- `given`: a candidate the name met only through an initial print (`Quellan, A.`) that also
+  printed a full given name the names package relates in no way to the asked one is another
+  dancer. An initial-only candidate, a variant or a diminutive (`nameKinship`) stays.
+
+A candidate at another school is set aside only by the hard school fact, never for being
+elsewhere: a dancer who ever danced for the asked school's line stays open.
+
+THE WIDENED PASSES (`r.widened`), only where the name as asked is left with no one, so a widened
+match never answers over an exact one:
+
+- `birth-conflict`: a birth window the release flags (`birth.conflict`) is read one year wider on
+  each side, and the candidate says so (`candidate.widened`).
+- `name-form`: the name read in its other forms by `@finbheara/names`: `composeNames` (a print
+  that left out a second surname, a middle name or a given name's letters, or a double-barrelled
+  surname read as its parts) or else `nameKinship` (a given name's variant or diminutive). Such a
+  candidate's `nameLevel` is `form` and `evidence.form` lists the tolerances. A form is set
+  aside only by the hard school fact (`why: "name-form"`, the fact in `r.fullName.refuted` or
+  `r.initials.refuted` where the answer was narrowed): every school row of the dancer, to the
+  asked year, reads outside the asked school's line. A dancer with no school row, or a print no
+  school reads, is unknown and stays.
 
 THE REGIONAL OIREACHTAS (`oireachtas: { region, year? }`). A dancer enters one
 residence-qualifying regional Oireachtas a year. Two regionals in one year are two dancers, the

package/dist/chunks/{index-xtv455ft.js → index-1ty89s8d.js}

@@ -77,7 +77,10 @@ import {
   populationRelation
 } from "@finbheara/domain/title";
 import {
+  composeNames,
   foldNameKey,
+  nameBlockKeys,
+  nameKinship,
   surnameBlock
 } from "@finbheara/names/normalize";
 import namesPkg from "@finbheara/names/package.json";
@@ -91,6 +94,7 @@ var NAME_LEVELS2 = [
   ...NAME_LEVEL_COLUMNS,
   "initial",
   "middle",
+  "form",
   "surname",
   "like"
 ];
@@ -640,7 +644,7 @@ var PERSON = { table: "person", value: "id", valueType: "INTEGER PRIMARY KEY" };
 var ASKED = ["surname_key", "nn4", "blk_surname"];
 var dancersIndex = {
   name: "dancers",
-  version: "4",
+  version: "5",
   inputs: ["results"],
   keyParts: () => [...PACKAGE_KEY_PARTS],
   says: "every published dancer print at the names package's keys, its dancers, schools and years",
@@ -652,6 +656,8 @@ var dancersIndex = {
     out.run("CREATE TABLE dancer_school(dancer_id INTEGER NOT NULL, school_id TEXT, print TEXT NOT NULL, rows INTEGER NOT NULL, year_lo INTEGER, year_hi INTEGER)");
     out.run("CREATE TABLE dancer_population(dancer_id INTEGER NOT NULL, population TEXT NOT NULL, rows INTEGER NOT NULL, PRIMARY KEY(dancer_id, population)) WITHOUT ROWID");
     out.run("CREATE TABLE dancer_regional(dancer_id INTEGER NOT NULL, year INTEGER NOT NULL, region TEXT NOT NULL, regional INTEGER NOT NULL, PRIMARY KEY(dancer_id, year)) WITHOUT ROWID");
+    out.run("CREATE TABLE person_block(block TEXT NOT NULL, person INTEGER NOT NULL)");
+    const putBlock = out.prepare("INSERT INTO person_block VALUES (?, ?)");
     const src = rel.db("results");
     const groups = src.query(`SELECT r.name_printed AS p, r.name_order_resolved AS o, r.dancer_id AS d,
 				        r.school_printed AS sp, r.school_id AS s,
@@ -673,6 +679,8 @@ var dancersIndex = {
           id = ++next;
           names.add(name, id);
           personOf.set(reading, id);
+          for (const b of nameBlockKeys(name))
+            putBlock.run(b, id);
         }
         personOf.set(k, id);
       }
@@ -748,6 +756,7 @@ var dancersIndex = {
     for (const s of schema.indexes)
       if (ASKED.some((c) => s.endsWith(`(${c})`)))
         out.run(s);
+    out.run("CREATE INDEX person_block_block ON person_block(block)");
     out.run("CREATE INDEX print_dancer_person ON print_dancer(person)");
     out.run("CREATE INDEX print_dancer_dancer ON print_dancer(dancer_id)");
     out.run("CREATE INDEX dancer_school_dancer ON dancer_school(dancer_id)");
@@ -767,6 +776,7 @@ var NAME_WEIGHT = {
   nn4: 3,
   initial: 2,
   middle: 1.5,
+  form: 1.25,
   surname: 1,
   like: 1
 };
@@ -907,7 +917,56 @@ class DancerResolver2 {
       if (level !== null)
         hits.set(value, level);
     }
-    return this.answer(db, q, hits);
+    const exact = await this.answer(db, q, hits);
+    if (exact.arm !== "none")
+      return exact;
+    const born = await this.answer(db, q, hits, true, { birthSlack: true });
+    if (born.arm !== "none")
+      return { ...born, widened: "birth-conflict" };
+    const forms = this.formsOf(db, names, asked, hits);
+    if (forms.size === 0)
+      return exact;
+    const all = new Map(hits);
+    for (const id of forms.keys())
+      all.set(id, "form");
+    const formed = await this.answer(db, q, all, true, { birthSlack: true, forms });
+    return formed.arm === "none" ? exact : { ...formed, widened: "name-form" };
+  }
+  formsOf(db, names, asked, hits) {
+    const out = new Map;
+    const keys = nameBlockKeys(asked);
+    const persons = new Set;
+    if (keys.length > 0)
+      for (const r of db.query(`SELECT DISTINCT person FROM person_block WHERE block IN (${keys.map(() => "?").join(",")})`).all(...keys))
+        persons.add(r.person);
+    const rows = new Map;
+    for (const { value, row } of names.rows({ surname_key: [asked.surnameKey()] }, [
+      "print",
+      "reading"
+    ]))
+      rows.set(value, row);
+    const ids = [...persons].filter((id) => !hits.has(id) && !rows.has(id));
+    for (let i = 0;i < ids.length; i += 500) {
+      const chunk = ids.slice(i, i + 500);
+      for (const r of db.query(`SELECT id, print, reading FROM person WHERE id IN (${chunk.map(() => "?").join(",")})`).all(...chunk))
+        rows.set(r.id, { print: r.print, reading: r.reading });
+    }
+    for (const [id, row] of rows) {
+      if (hits.has(id))
+        continue;
+      const c = ENCODER.decode(row);
+      if (!c.isPerson())
+        continue;
+      const composed = composeNames(asked, c);
+      if (composed.composition !== "conflict" && composed.composition !== "silent") {
+        out.set(id, [...composed.via]);
+        continue;
+      }
+      const kin = nameKinship(asked, c);
+      if (kin.relation !== "different")
+        out.set(id, [...kin.via]);
+    }
+    return out;
   }
   async search(q) {
     if (q.name !== undefined) {
@@ -958,7 +1017,7 @@ class DancerResolver2 {
       schools: schoolsOf(db, dancerId)
     };
   }
-  async answer(db, q, hits, narrow = true) {
+  async answer(db, q, hits, narrow = true, widen = {}) {
     const asOf = yearOf(q.asOf);
     const age = q.age === undefined ? undefined : this.readAge(q.age, asOf);
     const population = q.population === undefined ? undefined : readPopulation2(q.population);
@@ -967,7 +1026,7 @@ class DancerResolver2 {
     let lineageIds = [];
     let school;
     if (q.school !== undefined) {
-      const s = await this.rel.schools.resolve(q.school);
+      const s = await this.rel.schools.resolve(q.school, { year: askedYear(q, asOf) });
       schoolIds = s.candidates.map((c) => c.school_id);
       const lineage = await this.lineage();
       if (lineage === null)
@@ -987,9 +1046,11 @@ class DancerResolver2 {
           unlinked.set(r.print, (unlinked.get(r.print) ?? 0) + r.n);
           continue;
         }
-        const e = byDancer.get(r.d) ?? { level, prints: [] };
+        const e = byDancer.get(r.d) ?? { level, prints: [], via: new Set };
         e.level = finer(e.level, level);
         e.prints.push({ print: r.print, rows: r.n, level });
+        for (const v of widen.forms?.get(person) ?? [])
+          e.via.add(v);
         byDancer.set(r.d, e);
       }
     const dq = db.query("SELECT * FROM dancer WHERE dancer_id = ?");
@@ -1000,7 +1061,15 @@ class DancerResolver2 {
         continue;
       const schools = schoolsOf(db, id);
       const latest = latestSchool(schools, asOf);
-      const ageEv = ageEvidence(d, age?.age ?? null);
+      let ageEv = ageEvidence(d, age?.age ?? null);
+      let widenedBirth = false;
+      if (widen.birthSlack && ageEv === "contradicts" && d.birth_conflict !== 0) {
+        const wider = ageEvidence(d, age?.age ?? null, 1);
+        if (wider !== "contradicts") {
+          ageEv = wider;
+          widenedBirth = true;
+        }
+      }
       const pop = populationOf(db, id);
       const popEv = populationEvidence(pop, population?.read ?? null);
       const schoolEv = schoolIds === null ? "unasked" : schoolIds.length === 0 ? "unresolved" : await this.schoolEvidence(schools, schoolIds, lineageIds, asOf);
@@ -1021,8 +1090,10 @@ class DancerResolver2 {
           age: ageEv,
           school: schoolEv,
           population: popEv,
-          region: regionEv
+          region: regionEv,
+          ...e.level === "form" ? { form: [...e.via] } : {}
         },
+        ...widenedBirth ? { widened: "birth-conflict" } : {},
         prints: e.prints.sort((a, b) => b.rows - a.rows || (a.print < b.print ? -1 : 1)),
         rows: d.rows,
         year_lo: d.year_lo,
@@ -1049,21 +1120,54 @@ class DancerResolver2 {
         return false;
       });
     const year = askedYear(q, asOf);
-    let initials;
-    if (narrow && kept.length > 1 && schoolIds !== null && schoolIds.length > 0 && initialsOnly2(dancerName(q.name, q.order === "unknown" ? undefined : q.order))) {
+    const band = age?.age?.birthYears() ?? null;
+    const adultBy = adultBornBy(year);
+    const adultAsked = adultBy !== null && adultCategory(q.age, age?.age ?? null);
+    const returningOf = (c) => adultAsked && c.birth.hi !== null && c.birth.hi <= adultBy ? c.birth.lo : null;
+    let line = null;
+    if (schoolIds !== null && schoolIds.length > 0) {
       const lineage = await this.lineage();
-      const line = lineage === null ? new Set(schoolIds) : schoolLine(lineage, schoolIds, year);
-      const band = age?.age?.birthYears() ?? null;
+      line = lineage === null ? new Set(schoolIds) : schoolLine(lineage, schoolIds, year);
+    }
+    const formFacts = new Map;
+    if (narrow && widen.forms !== undefined && line !== null) {
+      const next = [];
+      for (const c of kept) {
+        if (c.evidence.nameLevel === "form") {
+          const fact = await this.schoolRefutes(schoolsOf(db, c.dancer_id), line, year, q.school, returningOf(c));
+          if (fact !== null) {
+            formFacts.set(c.dancer_id, fact);
+            excluded.push({ candidate: c, why: "name-form" });
+            continue;
+          }
+        }
+        next.push(c);
+      }
+      kept = next;
+    }
+    const askedName = dancerName(q.name, q.order === "unknown" ? undefined : q.order);
+    const byInitials = initialsOnly2(askedName);
+    let narrowing;
+    if (narrow && kept.length > 1 && line !== null) {
       const slack = q.age !== undefined && !("yob" in q.age) ? DANCE_UP_YEARS : 0;
       const open = [];
       const held = [];
       const refuted = [];
       const bySchool = new Set;
-      const adultBy = adultBornBy(year);
-      const adultAsked = adultBy !== null && adultCategory(q.age, age?.age ?? null);
+      const givenFact = (c) => {
+        if (byInitials || c.evidence.nameLevel !== "initial")
+          return false;
+        const fact = otherGiven(db, c.dancer_id, askedName);
+        if (fact === null)
+          return false;
+        refuted.push({ dancer_id: c.dancer_id, why: "given", fact });
+        bySchool.add(c.dancer_id);
+        return true;
+      };
       const schoolFact = async (c) => {
-        const returning = adultAsked && c.birth.hi !== null && c.birth.hi <= adultBy ? c.birth.lo : null;
-        const fact = await this.schoolRefutes(schoolsOf(db, c.dancer_id), line, year, q.school, returning);
+        if (givenFact(c))
+          return true;
+        const fact = await this.schoolRefutes(schoolsOf(db, c.dancer_id), line, year, q.school, returningOf(c));
         if (fact === null)
           return false;
         refuted.push({ dancer_id: c.dancer_id, why: "school", fact });
@@ -1084,10 +1188,10 @@ class DancerResolver2 {
         refuted.push({
           dancer_id: c.dancer_id,
           why: x.why,
-          fact: contradictionFact(x, age, slack)
+          fact: formFacts.get(c.dancer_id) ?? contradictionFact(x, age, slack)
         });
       }
-      initials = {
+      narrowing = {
         open: [...open.map((c) => c.dancer_id), ...held],
         heldByDanceUp: held,
         refuted,
@@ -1096,7 +1200,10 @@ class DancerResolver2 {
       if (open.length === 1 && held.length === 0) {
         for (const c of kept)
           if (bySchool.has(c.dancer_id))
-            excluded.push({ candidate: c, why: "school" });
+            excluded.push({
+              candidate: c,
+              why: refuted.find((r) => r.dancer_id === c.dancer_id)?.why === "given" ? "given" : "school"
+            });
         kept = open;
       }
     }
@@ -1126,8 +1233,8 @@ class DancerResolver2 {
         };
       }
     }
-    if (preferred === undefined && kept.length > 1 && initials !== undefined) {
-      const openIds = new Set(initials.open);
+    if (preferred === undefined && kept.length > 1 && narrowing !== undefined) {
+      const openIds = new Set(narrowing.open);
       const hit = kept.filter((c) => openIds.has(c.dancer_id) && c.year_hi !== null && c.year_hi >= year - 1);
       if (hit.length === 1) {
         const c = hit[0];
@@ -1149,7 +1256,7 @@ class DancerResolver2 {
       ...population !== undefined ? { population } : {},
       ...oireachtas !== undefined ? { oireachtas } : {},
       ...school !== undefined ? { school } : {},
-      ...initials !== undefined ? { initials } : {}
+      ...narrowing !== undefined ? byInitials ? { initials: narrowing } : { fullName: narrowing } : {}
     };
   }
   async readOireachtas(db, o, asOf) {
@@ -1282,6 +1389,22 @@ function youthRow(s, bornLo) {
   const by = adultBornBy(s.year_hi);
   return by !== null && bornLo > by;
 }
+function otherGiven(db, dancerId, asked) {
+  const r = db.query("SELECT names_printed FROM dancer WHERE dancer_id = ?").get(dancerId);
+  if (r === null)
+    return null;
+  for (const print of JSON.parse(r.names_printed)) {
+    const p = dancerName(print);
+    if (!p.isPerson() || (p.givenFields()[0]?.length ?? 0) < 2)
+      continue;
+    if (nameLevel2(asked, p) !== null)
+      continue;
+    if (nameKinship(asked, p).relation !== "different")
+      continue;
+    return `printed "${print}", another given name than the asked one, and met it only through an initial`;
+  }
+  return null;
+}
 function birthOf(d) {
   return {
     lo: d.birth_lo,
@@ -1349,12 +1472,12 @@ function regionEvidence(db, dancerId, region, year) {
     return { word: "contradicts", region: at(latest) };
   return { word: latest.region === region ? "same" : "moved", region: at(latest) };
 }
-function ageEvidence(d, asked) {
+function ageEvidence(d, asked, slack = 0) {
   if (asked === null)
     return "unasked";
   if (d.birth_lo === null && d.birth_hi === null)
     return "unknown";
-  const own = Age.fromYOB(d.birth_lo, d.birth_hi);
+  const own = Age.fromYOB(d.birth_lo === null ? null : d.birth_lo - slack, d.birth_hi === null ? null : d.birth_hi + slack);
   if (!own.isAge())
     return "unknown";
   if (own.fitsIn(asked))
@@ -1989,22 +2112,28 @@ var encoderOf = (r) => schoolEncoder({ reader: r.reader });
 var TABLE = "school_name";
 var schoolsIndex = {
   name: "schools",
-  version: "2",
+  version: "3",
   inputs: ["results", "school-registry.jsonl", "school-redirects.jsonl"],
   says: "every published school print and its ids, read at the school reader's slots",
   keyParts: (rel) => [`reader=${rel.schoolReader().id}`],
   build(rel, out) {
     const choice = rel.schoolReader();
     const encoder = encoderOf(choice);
-    out.run("CREATE TABLE print_id(print TEXT NOT NULL, school_id TEXT NOT NULL, rows INTEGER NOT NULL, PRIMARY KEY(print, school_id)) WITHOUT ROWID");
+    out.run("CREATE TABLE print_id(print TEXT NOT NULL, school_id TEXT NOT NULL, rows INTEGER NOT NULL, year_lo INTEGER, year_hi INTEGER, PRIMARY KEY(print, school_id)) WITHOUT ROWID");
     out.run("CREATE TABLE registry(school_id TEXT PRIMARY KEY, display TEXT NOT NULL, regions TEXT NOT NULL, places TEXT NOT NULL)");
     out.run("CREATE TABLE redirect(old_id TEXT PRIMARY KEY, new_id TEXT NOT NULL, kind TEXT NOT NULL)");
     const schema = indexSchema3(encoder, { table: TABLE });
     out.run(schema.table);
-    const pairs = rel.db("results").query("SELECT trim(school_printed) AS p, school_id AS s, count(*) AS n FROM results WHERE school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2").all();
-    const putPair = out.prepare("INSERT INTO print_id VALUES (?, ?, ?)");
+    const src = rel.db("results");
+    const lined = src.query("PRAGMA table_info(results)").all().some((c) => c.name === "competition_line");
+    const pairs = src.query(lined ? `SELECT trim(r.school_printed) AS p, r.school_id AS s, count(*) AS n,
+				        min(c.year) AS lo, max(c.year) AS hi
+				 FROM results r LEFT JOIN competitions c ON c.file = r.file AND c.line = r.competition_line
+				 WHERE r.school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2` : `SELECT trim(school_printed) AS p, school_id AS s, count(*) AS n, NULL AS lo, NULL AS hi
+				 FROM results WHERE school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2`).all();
+    const putPair = out.prepare("INSERT INTO print_id VALUES (?, ?, ?, ?, ?)");
     for (const r of pairs)
-      putPair.run(r.p, r.s, r.n);
+      putPair.run(r.p, r.s, r.n, r.lo, r.hi);
     out.run("CREATE INDEX print_id_school ON print_id(school_id)");
     const names = createIndex3(out, encoder, {
       table: TABLE
@@ -2049,6 +2178,23 @@ class SchoolResolver2 {
     };
     const answer = (candidates, extra = {}) => {
       let cs = candidates.sort((a, b) => b.rows - a.rows || (a.school_id < b.school_id ? -1 : 1));
+      let year;
+      if (q.year !== undefined && cs.length > 1 && cs.every((c) => c.years !== undefined)) {
+        const y = q.year;
+        const span = (c) => c.years;
+        let kept = cs.filter((c) => {
+          const { lo, hi } = span(c);
+          return lo !== null && hi !== null && lo <= y && y <= hi;
+        });
+        if (kept.length === 0) {
+          const before = cs.filter((c) => span(c).hi !== null && span(c).hi < y);
+          const last = Math.max(...before.map((c) => span(c).hi));
+          kept = before.filter((c) => span(c).hi === last);
+        }
+        year = { asked: y, narrowed: kept.length > 0 && kept.length < cs.length };
+        if (kept.length > 0)
+          cs = kept;
+      }
       let region;
       if (q.region !== undefined) {
         const kept = cs.filter((c) => c.regions.length === 0 || c.regions.includes(q.region));
@@ -2062,6 +2208,7 @@ class SchoolResolver2 {
         arm: cs.length === 0 ? "none" : cs.length === 1 ? "unique" : "ambiguous",
         candidates: cs,
         ...region !== undefined ? { region } : {},
+        ...year !== undefined ? { year } : {},
         ...extra
       };
     };
@@ -2085,15 +2232,27 @@ class SchoolResolver2 {
       return answer([byId(live, "redirect")], { redirected: { from: a, to: live } });
     const byPrints = (prints, by) => {
       const ids = new Map;
-      const q2 = db.query("SELECT school_id, rows FROM print_id WHERE print = ?");
+      const q2 = db.query("SELECT school_id, rows, year_lo AS lo, year_hi AS hi FROM print_id WHERE print = ?");
       for (const p of prints)
         for (const r of q2.all(p)) {
-          const e = ids.get(r.school_id) ?? { rows: 0, prints: new Set };
+          const e = ids.get(r.school_id) ?? {
+            rows: 0,
+            prints: new Set,
+            lo: null,
+            hi: null
+          };
           e.rows += r.rows;
           e.prints.add(p);
+          if (r.lo !== null && (e.lo === null || r.lo < e.lo))
+            e.lo = r.lo;
+          if (r.hi !== null && (e.hi === null || r.hi > e.hi))
+            e.hi = r.hi;
           ids.set(r.school_id, e);
         }
-      return [...ids].map(([id, e]) => candidate(id, by, e.rows, [...e.prints].sort()));
+      return [...ids].map(([id, e]) => ({
+        ...candidate(id, by, e.rows, [...e.prints].sort()),
+        years: { lo: e.lo, hi: e.hi }
+      }));
     };
     const exact = byPrints([a], "print");
     if (exact.length > 0)

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   nameOrderOf,
   openRelease2,
   releases2
-} from "./chunks/index-xtv455ft.js";
+} from "./chunks/index-1ty89s8d.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 

package/dist/index.js

@@ -46,7 +46,7 @@ import {
   openCached2,
   ReleaseManager2,
   releases2
-} from "./chunks/index-xtv455ft.js";
+} from "./chunks/index-1ty89s8d.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/dancers-names.d.ts

@@ -1,5 +1,5 @@
 import { type PersonName, type TransitiveLevel } from "@finbheara/names/normalize";
-export type NameLevel = TransitiveLevel | "initial" | "middle" | "surname" | "like";
+export type NameLevel = TransitiveLevel | "initial" | "middle" | "form" | "surname" | "like";
 export declare const NAME_LEVELS: readonly NameLevel[];
 export declare const finer: (a: NameLevel, b: NameLevel) => NameLevel;
 export declare function nameLevel(q: PersonName, c: PersonName): NameLevel | null;

package/dist/types/dancers.d.ts

@@ -52,7 +52,9 @@ export interface DancerCandidate {
         school: SchoolEvidence;
         population: PopulationEvidence;
         region: RegionEvidence;
+        form?: string[];
     };
+    widened?: "birth-conflict";
     prints: {
         print: string;
         rows: number;
@@ -82,13 +84,19 @@ export interface DancerRegion {
 }
 export interface ExcludedCandidate {
     candidate: DancerCandidate;
-    why: "age" | "population" | "region" | "school";
+    why: "age" | "population" | "region" | "school" | "given" | "name-form";
 }
 export interface InitialsRefuted {
     dancer_id: number;
-    why: "school" | "age" | "population" | "region";
+    why: "school" | "age" | "population" | "region" | "given" | "name-form";
     fact: string;
 }
+export interface Narrowing {
+    open: number[];
+    heldByDanceUp: number[];
+    refuted: InitialsRefuted[];
+    year: number;
+}
 export interface DancerAnswer {
     tag: string;
     asked: DancerQuery;
@@ -128,12 +136,9 @@ export interface DancerAnswer {
         lineage?: string[];
     };
     refused?: string;
-    initials?: {
-        open: number[];
-        heldByDanceUp: number[];
-        refuted: InitialsRefuted[];
-        year: number;
-    };
+    initials?: Narrowing;
+    fullName?: Narrowing;
+    widened?: "birth-conflict" | "name-form";
 }
 export interface DancerSearchQuery extends Omit<DancerQuery, "name"> {
     name?: string;
@@ -216,6 +221,7 @@ export declare class DancerResolver {
         years: DancerYear[];
     }>;
     resolve(q: DancerQuery): Promise<DancerAnswer>;
+    private formsOf;
     search(q: DancerSearchQuery): Promise<DancerAnswer>;
     private capped;
     get(dancerId: number): Promise<DancerRecord | null>;

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 export { type AssetPlan, DATABASES, type DatabaseName, type LandedFile, type Receipt, type ReleaseManifest, planAsset, } from "./assets.js";
 export { sha256File, unzstdTo } from "./bytes.js";
-export { type AgeAsked, type AgeEvidence, type DancerAnswer, type DancerBulkRecord, type DancerCandidate, type DancerQuery, type DancerRecord, DancerResolver, type DancerRegion, type DancerSchool, type DancerSearchQuery, type DancerYear, type ExcludedCandidate, FEIS_LOCAL_ID_FLOOR, type InitialsRefuted, initialsOnly, type OireachtasAsked, type PopulationEvidence, type RegionEvidence, type SchoolEvidence, readPopulation, } from "./dancers.js";
+export { type AgeAsked, type AgeEvidence, type DancerAnswer, type DancerBulkRecord, type DancerCandidate, type DancerQuery, type DancerRecord, DancerResolver, type DancerRegion, type DancerSchool, type DancerSearchQuery, type DancerYear, type ExcludedCandidate, FEIS_LOCAL_ID_FLOOR, type InitialsRefuted, type Narrowing, initialsOnly, type OireachtasAsked, type PopulationEvidence, type RegionEvidence, type SchoolEvidence, readPopulation, } from "./dancers.js";
 export { NAME_LEVELS, type NameLevel, nameLevel } from "./dancers-names.js";
 export { type Comp, type CompAnswer, type CompDance, type CompKind, type CompQuery, CompResolver, type CompSource, type FeisPlace, type SyllabusAnswer, type SyllabusForAnswer, type SyllabusSource, type TitleCheck, canonicalOf, } from "./comps.js";
 export { type ClientOptions, cacheRoot, repoOf } from "./config.js";

package/dist/types/schools.d.ts

@@ -10,6 +10,10 @@ export interface SchoolCandidate {
     prints: string[];
     regions: string[];
     places: string[];
+    years?: {
+        lo: number | null;
+        hi: number | null;
+    };
 }
 export interface SchoolAnswer {
     tag: string;
@@ -20,6 +24,10 @@ export interface SchoolAnswer {
         asked: string;
         narrowed: boolean;
     };
+    year?: {
+        asked: number;
+        narrowed: boolean;
+    };
     redirected?: {
         from: string;
         to: string;
@@ -28,6 +36,7 @@ export interface SchoolAnswer {
 }
 export interface SchoolQuery {
     region?: string;
+    year?: number;
 }
 export interface SchoolReaderChoice {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.12.0",
+	"version": "0.13.0",
 	"description": "Open a versioned release of an Irish dance results archive: download, verify, decompress and cache it by tag, keep the cache, and resolve feises and schools against it",
 	"keywords": ["irish-dance", "results", "release", "cache", "sqlite"],
 	"license": "MIT",