@finbheara/archive-client 0.11.0 → 0.13.0

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

@@ -71,9 +71,16 @@ import { Age, DANCE_UP_YEARS, birthYearsMeet } from "@finbheara/domain/age";
 import { createIndex, indexSchema, personEncoder } from "@finbheara/domain/noun-index";
 import domainPkg from "@finbheara/domain/package.json";
 import { dancerName } from "@finbheara/domain/person";
-import { populationIn, populationRelation } from "@finbheara/domain/title";
 import {
+  compTitle,
+  populationIn,
+  populationRelation
+} from "@finbheara/domain/title";
+import {
+  composeNames,
   foldNameKey,
+  nameBlockKeys,
+  nameKinship,
   surnameBlock
 } from "@finbheara/names/normalize";
 import namesPkg from "@finbheara/names/package.json";
@@ -87,6 +94,7 @@ var NAME_LEVELS2 = [
   ...NAME_LEVEL_COLUMNS,
   "initial",
   "middle",
+  "form",
   "surname",
   "like"
 ];
@@ -339,286 +347,23 @@ function notOnTheFloor(placePrinted, atts, withdrawn) {
   return withdrawn !== null && DID_NOT_TABULATE.has(withdrawn);
 }
 
-function columnsOf2(db, table) {
-  return new Set(db.query("SELECT name FROM pragma_table_info(?)").all(table).map((r) => r.name));
-}
-var FEATURES2 = [
-  {
-    feature: "results.level",
-    needs: ["results:competitions.feis_level"],
-    since: 215,
-    calls: "results.query, majors.results"
-  },
-  {
-    feature: "majors.order",
-    needs: ["majors:competitions.seq"],
-    since: 260,
-    calls: "majors.competitions"
-  },
-  {
-    feature: "dancers",
-    needs: ["results:results.name_order_resolved"],
-    since: 260,
-    calls: "dancers.resolve, dancers.search, dancers.get (the dancers index)"
-  },
-  {
-    feature: "schools",
-    needs: ["school-registry.jsonl", "school-redirects.jsonl"],
-    since: 260,
-    calls: "schools.resolve, a dancer question with a school (the schools index)"
-  },
-  {
-    feature: "feises",
-    needs: [
-      "results:feises.date_lo",
-      "results:feises.date_hi",
-      "results:feises.feis_instance_id",
-      "results:feises.feis_brand_id",
-      "results:competitions.feis_region",
-      "feis-redirects.jsonl"
-    ],
-    since: 265,
-    calls: "feises.find, feises.series, and comps and registrations through them (the feises index)"
-  },
-  {
-    feature: "comps",
-    needs: [
-      "results:competitions.feis_level",
-      "results:competitions.round",
-      "results:feises.feis_brand_id"
-    ],
-    since: 265,
-    calls: "comps.resolve, comps.syllabus, comps.syllabusFor, registrations.resolve (the comps index)"
-  },
-  {
-    feature: "comps.dance",
-    needs: ["results:competitions.dance"],
-    since: 270,
-    calls: "the `dance` a comp of comps.resolve, comps.syllabus and comps.syllabusFor carries: null, never refused, on a release without it"
-  },
-  {
-    feature: "schools.lineage",
-    needs: ["school-lineage.jsonl"],
-    since: 184,
-    calls: "the `lineage` school evidence of dancers.resolve and dancers.search: no school is joined by lineage, never refused, on a release without it"
-  },
-  {
-    feature: "results.stream",
-    needs: [
-      "results:competitions.round",
-      "results:competitions.feis_level",
-      "results:competitions.level_printed",
-      "results:competitions.age_printed",
-      "results:results.yob_printed",
-      "results:results.primary_source",
-      "results:results.platform_dancer_id",
-      "results:results.relative_place",
-      "results:feises.date_lo",
-      "results:feises.date_hi"
-    ],
-    since: 255,
-    calls: "results.stream, results.entries (scopes transcribed, platform, all)"
-  },
-  {
-    feature: "majors.stream",
-    needs: [
-      "majors:competitions.round",
-      "majors:competitions.feis_level",
-      "majors:results.yob_printed",
-      "majors:results.primary_source",
-      "majors:results.relative_place",
-      "majors:feises.date_lo"
-    ],
-    since: 255,
-    calls: "results.stream, results.entries (scope majors)"
-  },
-  {
-    feature: "results.printed_age",
-    needs: ["results:results.printed_age", "majors:results.printed_age"],
-    since: 271,
-    calls: "the `printed_age` a row of results.stream and results.entries carries: null, never refused, on a release without it"
-  },
-  {
-    feature: "majors.tabs",
-    needs: ["majors:tabs.address", "majors:tabs.true_round"],
-    since: 215,
-    calls: "majors.tabulated"
-  },
-  {
-    feature: "feises.dates",
-    needs: ["results:feises.feis_id", "results:feises.date_lo", "results:feises.date_hi"],
-    since: 245,
-    calls: "feises.dates"
-  },
-  {
-    feature: "dancers.records",
-    needs: [
-      "results:dancers.display",
-      "results:dancers.appearances",
-      "results:dancers.birth_lo",
-      "results:dancers.birth_hi",
-      "results:dancers.birth_source",
-      "results:dancers.birth_conflict",
-      "results:dancers.genders"
-    ],
-    since: 215,
-    calls: "dancers.records"
-  },
-  {
-    feature: "dancers.years",
-    needs: [
-      "results:dancer_years.region",
-      "results:dancer_years.region_source",
-      "results:dancer_years.nationals",
-      "results:dancer_years.nationals_source",
-      "results:dancer_years.geohash"
-    ],
-    since: 245,
-    calls: "dancers.years"
-  },
-  {
-    feature: "teams",
-    needs: [
-      ...[
-        "slug",
-        "address",
-        "event",
-        "year",
-        "card",
-        "comp_no",
-        "title",
-        "category",
-        "hands",
-        "letter",
-        "label",
-        "name_printed",
-        "school_printed",
-        "school_loc",
-        "school_id",
-        "place",
-        "place_printed",
-        "tie",
-        "competitors",
-        "atts"
-      ].map((c) => `table:team_results.${c}`),
-      ...[
-        "team",
-        "kind",
-        "event_year",
-        "year",
-        "comp_no",
-        "title",
-        "team_index",
-        "seq",
-        "school_id",
-        "school_print_materialized"
-      ].map((c) => `table:roster_teams.${c}`),
-      ...["team", "seq", "name_printed", "name", "yob", "dancer_id"].map((c) => `table:roster_members.${c}`),
-      ...[
-        "event_year",
-        "comp_no",
-        "team",
-        "result_address",
-        "school_id",
-        "join_kind",
-        "via_split",
-        "roster_teams",
-        "result_teams",
-        "roster_index",
-        "result_letter"
-      ].map((c) => `table:team_result_rosters.${c}`),
-      "table:event_years.event_year",
-      "table:event_years.event",
-      "table:event_years.year"
-    ],
-    since: 260,
-    calls: "teams.results, teams.rosters, teams.resultRosters (the teams index)"
-  },
-  {
-    feature: "teams.fields",
-    needs: [
-      "table:team_results.age",
-      "table:team_results.gender",
-      "table:team_results.printed_status",
-      "table:roster_teams.dance",
-      "table:roster_teams.school_print_as_of",
-      "table:roster_members.gender"
-    ],
-    since: 266,
-    calls: "the fields teams.results (age, gender, printed_status) and teams.rosters (dance, school_printed_as_of, a member's gender) carry where present: absent, never refused, on a release without them"
-  },
-  {
-    feature: "events",
-    needs: [
-      "event_year",
-      "event",
-      "year",
-      "date_lo",
-      "date_hi",
-      "resolution",
-      "source",
-      "date_printed",
-      "place",
-      "place_printed"
-    ].map((c) => `table:event_years.${c}`),
-    since: 260,
-    calls: "events.years (the events index)"
-  },
-  {
-    feature: "staff",
-    needs: [
-      "results:adjudicators",
-      "results:feis_panels",
-      "school-staff.jsonl",
-      "school-teachers.jsonl",
-      "school-registry.jsonl"
-    ],
-    since: 260,
-    calls: "staff.teacher, staff.adjudicator (the staff index)"
-  }
-];
-async function hasNeed(probe, n) {
-  const t = /^table:([A-Za-z_]+)(?:\.([A-Za-z_]+))?$/.exec(n);
-  if (t !== null) {
-    if (probe.tableColumns === undefined)
-      return false;
-    const cols = await probe.tableColumns(t[1]);
-    return t[2] === undefined ? cols.size > 0 : cols.has(t[2]);
-  }
-  const m = /^(results|majors):([A-Za-z_]+)(?:\.([A-Za-z_]+))?$/.exec(n);
-  if (m === null)
-    return probe.publishes(n);
-  const cols = columnsOf2(await probe.db(m[1]), m[2]);
-  return m[3] === undefined ? cols.size > 0 : cols.has(m[3]);
-}
-async function capabilityOf2(probe, f) {
-  const missing = [];
-  for (const n of f.needs)
-    if (!await hasNeed(probe, n))
-      missing.push(n);
-  return { ...f, state: missing.length === 0 ? "full" : "missing", missing };
-}
-function needsRelease2(tag, c) {
-  return new Error(`archive-client: ${tag} is too old for ${c.feature} (${c.calls}): it lacks ${c.missing.join(", ")}. Open a release of cut ${c.since} or later`);
-}
-
-var ENTRY_RANK = new Map([
-  ["final", 0],
-  ["", 1],
-  ["recall", 2],
-  ["standings", 3],
-  ["unplaced", 4],
-  ["qual", 5],
-  ["qual-a", 5],
-  ["qual-b", 5]
-]);
-function entryRank2(section) {
-  const known = ENTRY_RANK.get(section);
-  if (known !== undefined)
-    return known;
-  if (/^solo(?:-r\d+)?$/.test(section))
-    return 6;
-  return 9;
+var ENTRY_RANK = new Map([
+  ["final", 0],
+  ["", 1],
+  ["recall", 2],
+  ["standings", 3],
+  ["unplaced", 4],
+  ["qual", 5],
+  ["qual-a", 5],
+  ["qual-b", 5]
+]);
+function entryRank2(section) {
+  const known = ENTRY_RANK.get(section);
+  if (known !== undefined)
+    return known;
+  if (/^solo(?:-r\d+)?$/.test(section))
+    return 6;
+  return 9;
 }
 var COLUMNS = `r.address AS address, r.competition AS competition, c.event AS event,
 	c.year AS year, c.tier AS tier, c.comp_no AS comp_no, c.title AS title, c.category AS category,
@@ -632,13 +377,9 @@ var COLUMNS = `r.address AS address, r.competition AS competition, c.event AS ev
 	r.yob_printed AS yob_printed, r.points_printed AS points_printed,
 	r.platform_dancer_id AS platform_dancer_id, r.primary_source AS primary_source,
 	r.file AS file, r.line AS line`;
-var printedAgeColumn = (carried) => carried ? "r.printed_age AS printed_age" : "NULL AS printed_age";
-var streamColumns = (db) => ({
-  printedAge: columnsOf2(db, "results").has("printed_age")
-});
 var TRANSCRIBED = "('transcript', 'manifested')";
 var scopeDb = (s) => s === "majors" ? "majors" : "results";
-function streamSql(q, carried = { printedAge: false }) {
+function streamSql(q) {
   const where = [];
   const args = [];
   const list = (col, v, nocase = false) => {
@@ -679,7 +420,7 @@ function streamSql(q, carried = { printedAge: false }) {
   if (q.primary === true)
     where.push("(r.primary_source IS NULL OR r.primary_source = '')");
   return {
-    sql: `SELECT ${COLUMNS}, ${printedAgeColumn(carried.printedAge)} FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line${where.length === 0 ? "" : ` WHERE ${where.join(" AND ")}`} ORDER BY r.file, r.line`,
+    sql: `SELECT ${COLUMNS} FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line${where.length === 0 ? "" : ` WHERE ${where.join(" AND ")}`} ORDER BY r.file, r.line`,
     args
   };
 }
@@ -702,13 +443,12 @@ function rowOf(r, dates) {
     withdrawn: text(withdrawn),
     qualifier: text(rest.qualifier),
     primary_source: text(rest.primary_source),
-    printed_age: text(rest.printed_age),
     dancer_scope: r.dancer_id === null ? null : r.dancer_id >= FEIS_LOCAL_ID_FLOOR2 ? "per-release" : "stable"
   };
 }
 async function* streamRows(db, q) {
   const dates = feisDates(db);
-  const { sql, args } = streamSql(q, streamColumns(db));
+  const { sql, args } = streamSql(q);
   const stmt = db.prepare(sql);
   try {
     for (const r of stmt.iterate(...args))
@@ -719,7 +459,7 @@ async function* streamRows(db, q) {
 }
 async function* entryRows(db, q) {
   const dates = feisDates(db);
-  const { sql, args } = streamSql(q, streamColumns(db));
+  const { sql, args } = streamSql(q);
   const stmt = db.prepare(sql);
   let file = null;
   let held = new Map;
@@ -904,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",
@@ -916,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,
@@ -937,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);
       }
@@ -1012,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)");
@@ -1031,6 +776,7 @@ var NAME_WEIGHT = {
   nn4: 3,
   initial: 2,
   middle: 1.5,
+  form: 1.25,
   surname: 1,
   like: 1
 };
@@ -1171,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) {
@@ -1222,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);
@@ -1231,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)
@@ -1251,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 = ?");
@@ -1264,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);
@@ -1285,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,
@@ -1313,18 +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 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 fact = await this.schoolRefutes(schoolsOf(db, c.dancer_id), line, year, q.school);
+        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 });
@@ -1345,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,
@@ -1357,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;
       }
     }
@@ -1387,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];
@@ -1410,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) {
@@ -1463,20 +1309,30 @@ class DancerResolver2 {
     }
     return joined ? "lineage" : earlier ? "moved" : "none";
   }
-  async schoolRefutes(schools, line, year, asked) {
+  async schoolRefutes(schools, line, year, asked, returning = null) {
     const rows = schools.filter((s) => s.year_lo === null || s.year_lo <= year);
     if (rows.length === 0)
       return null;
     const seen = new Set;
+    const kept = [];
+    let youth = 0;
     for (const s of rows) {
       const own = await this.schoolIdsOf(s);
       if (own.length === 0 || own.some((id) => line.has(id)))
         return null;
+      if (returning !== null && youthRow(s, returning)) {
+        youth++;
+        continue;
+      }
+      kept.push(s);
       for (const id of own)
         seen.add(id);
     }
-    const last = latestSchool(rows, year);
-    return `every school row to ${year} reads ${[...seen].sort().join(", ")} (the latest ${last?.school_id ?? last?.print} in ${last?.year_hi}), none of them ${asked ?? "the asked school"} or a school its line joined by ${year}`;
+    if (kept.length === 0)
+      return null;
+    const last = latestSchool(kept, year);
+    const set = youth > 0 ? ` (${youth} youth row(s) set aside for an adult-category question)` : "";
+    return `every school row to ${year} reads ${[...seen].sort().join(", ")} (the latest ${last?.school_id ?? last?.print} in ${last?.year_hi}), none of them ${asked ?? "the asked school"} or a school its line joined by ${year}${set}`;
   }
   async schoolIdsOf(s) {
     const key = s.school_id ?? s.print;
@@ -1515,6 +1371,40 @@ class DancerResolver2 {
     return done(Age.from(c.age, { year: c.year }));
   }
 }
+function adultBornBy(year) {
+  const a = Age.from("adult", { year });
+  return a.isAge() ? a.birthYears().to : null;
+}
+function adultCategory(asked, read) {
+  if (read?.isAge() && read.isAdult())
+    return true;
+  if (asked === undefined || !("band" in asked))
+    return false;
+  const t = compTitle(asked.band).age;
+  return t?.isAge() === true && t.isAdult();
+}
+function youthRow(s, bornLo) {
+  if (bornLo === null || s.year_hi === null)
+    return false;
+  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,
@@ -1582,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))
@@ -1620,7 +1510,7 @@ function contradictionFact(x, age, slack) {
 import { Age as Age2 } from "@finbheara/domain/age";
 import {
   codePopulation,
-  compTitle,
+  compTitle as compTitle2,
   matchTitle,
   populationIn as populationIn2,
   secondIn,
@@ -1689,7 +1579,7 @@ function compOf(r, codes = []) {
   const stated = r.gender_source === "level" ? "" : populationIn2(r.gender ?? "");
   const pop = stated || populationIn2(r.title ?? "") || (r.platform === "ifeis" && codes.length > 0 ? codePopulation(r.code, codes) : "") || populationIn2(r.gender ?? "");
   const second = [r.title, r.level_printed, r.dance_printed].some((t) => t != null && secondIn(t));
-  const round = r.round ?? (r.title === null ? null : compTitle(r.title).round?.toString() ?? null);
+  const round = r.round ?? (r.title === null ? null : compTitle2(r.title).round?.toString() ?? null);
   return {
     competition: r.competition,
     feis_id: r.feis_id,
@@ -1950,7 +1840,7 @@ class CompResolver2 {
       if (q.title === undefined || q.title.trim() === "")
         return answer("unique", "prior-year", hits, { from, check: "unchecked" });
       const m = matchTitle(q.title, [entryOf(hit)]);
-      const r = titleRelation(m.title, compTitle(hit.title ?? "", {}));
+      const r = titleRelation(m.title, compTitle2(hit.title ?? "", {}));
       const check = {
         title: q.title,
         agrees: m.isSingular(),
@@ -2222,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
@@ -2282,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));
@@ -2295,6 +2208,7 @@ class SchoolResolver2 {
         arm: cs.length === 0 ? "none" : cs.length === 1 ? "unique" : "ambiguous",
         candidates: cs,
         ...region !== undefined ? { region } : {},
+        ...year !== undefined ? { year } : {},
         ...extra
       };
     };
@@ -2318,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)
@@ -2732,7 +2658,7 @@ import {
 import { join as join3 } from "path";
 
 import { Age as Age3 } from "@finbheara/domain/age";
-import { compTitle as compTitle2 } from "@finbheara/domain/title";
+import { compTitle as compTitle3 } from "@finbheara/domain/title";
 function youngest2(answers) {
   const key = (a) => {
     const iv = Age3.from(a.age, { year: null }).interval();
@@ -2812,7 +2738,7 @@ class RegistrationResolver2 {
       const printed = first !== undefined ? [] : comps.flatMap((c, i) => {
         const code = row.codes[i];
         const t = row.titles?.[code];
-        const a = t === undefined ? null : compTitle2(t).age;
+        const a = t === undefined ? null : compTitle3(t).age;
         return a?.isAge() === true && a.kind !== "yob" ? [{ age: a.ag1, year: c.feis.year, code }] : [];
       });
       const byTitle = youngest2(printed);
@@ -3022,6 +2948,263 @@ function defaultRemote() {
   return installed ?? fallbackRemote2(ghRemote2, httpsRemote2());
 }
 
+function columnsOf2(db, table) {
+  return new Set(db.query("SELECT name FROM pragma_table_info(?)").all(table).map((r) => r.name));
+}
+var FEATURES2 = [
+  {
+    feature: "results.level",
+    needs: ["results:competitions.feis_level"],
+    since: 215,
+    calls: "results.query, majors.results"
+  },
+  {
+    feature: "majors.order",
+    needs: ["majors:competitions.seq"],
+    since: 260,
+    calls: "majors.competitions"
+  },
+  {
+    feature: "dancers",
+    needs: ["results:results.name_order_resolved"],
+    since: 260,
+    calls: "dancers.resolve, dancers.search, dancers.get (the dancers index)"
+  },
+  {
+    feature: "schools",
+    needs: ["school-registry.jsonl", "school-redirects.jsonl"],
+    since: 260,
+    calls: "schools.resolve, a dancer question with a school (the schools index)"
+  },
+  {
+    feature: "feises",
+    needs: [
+      "results:feises.date_lo",
+      "results:feises.date_hi",
+      "results:feises.feis_instance_id",
+      "results:feises.feis_brand_id",
+      "results:competitions.feis_region",
+      "feis-redirects.jsonl"
+    ],
+    since: 265,
+    calls: "feises.find, feises.series, and comps and registrations through them (the feises index)"
+  },
+  {
+    feature: "comps",
+    needs: [
+      "results:competitions.feis_level",
+      "results:competitions.round",
+      "results:feises.feis_brand_id"
+    ],
+    since: 265,
+    calls: "comps.resolve, comps.syllabus, comps.syllabusFor, registrations.resolve (the comps index)"
+  },
+  {
+    feature: "comps.dance",
+    needs: ["results:competitions.dance"],
+    since: 270,
+    calls: "the `dance` a comp of comps.resolve, comps.syllabus and comps.syllabusFor carries: null, never refused, on a release without it"
+  },
+  {
+    feature: "schools.lineage",
+    needs: ["school-lineage.jsonl"],
+    since: 184,
+    calls: "the `lineage` school evidence of dancers.resolve and dancers.search: no school is joined by lineage, never refused, on a release without it"
+  },
+  {
+    feature: "results.stream",
+    needs: [
+      "results:competitions.round",
+      "results:competitions.feis_level",
+      "results:competitions.level_printed",
+      "results:competitions.age_printed",
+      "results:results.yob_printed",
+      "results:results.primary_source",
+      "results:results.platform_dancer_id",
+      "results:results.relative_place",
+      "results:feises.date_lo",
+      "results:feises.date_hi"
+    ],
+    since: 255,
+    calls: "results.stream, results.entries (scopes transcribed, platform, all)"
+  },
+  {
+    feature: "majors.stream",
+    needs: [
+      "majors:competitions.round",
+      "majors:competitions.feis_level",
+      "majors:results.yob_printed",
+      "majors:results.primary_source",
+      "majors:results.relative_place",
+      "majors:feises.date_lo"
+    ],
+    since: 255,
+    calls: "results.stream, results.entries (scope majors)"
+  },
+  {
+    feature: "majors.tabs",
+    needs: ["majors:tabs.address", "majors:tabs.true_round"],
+    since: 215,
+    calls: "majors.tabulated"
+  },
+  {
+    feature: "feises.dates",
+    needs: ["results:feises.feis_id", "results:feises.date_lo", "results:feises.date_hi"],
+    since: 245,
+    calls: "feises.dates"
+  },
+  {
+    feature: "dancers.records",
+    needs: [
+      "results:dancers.display",
+      "results:dancers.appearances",
+      "results:dancers.birth_lo",
+      "results:dancers.birth_hi",
+      "results:dancers.birth_source",
+      "results:dancers.birth_conflict",
+      "results:dancers.genders"
+    ],
+    since: 215,
+    calls: "dancers.records"
+  },
+  {
+    feature: "dancers.years",
+    needs: [
+      "results:dancer_years.region",
+      "results:dancer_years.region_source",
+      "results:dancer_years.nationals",
+      "results:dancer_years.nationals_source",
+      "results:dancer_years.geohash"
+    ],
+    since: 245,
+    calls: "dancers.years"
+  },
+  {
+    feature: "teams",
+    needs: [
+      ...[
+        "slug",
+        "address",
+        "event",
+        "year",
+        "card",
+        "comp_no",
+        "title",
+        "category",
+        "hands",
+        "letter",
+        "label",
+        "name_printed",
+        "school_printed",
+        "school_loc",
+        "school_id",
+        "place",
+        "place_printed",
+        "tie",
+        "competitors",
+        "atts"
+      ].map((c) => `table:team_results.${c}`),
+      ...[
+        "team",
+        "kind",
+        "event_year",
+        "year",
+        "comp_no",
+        "title",
+        "team_index",
+        "seq",
+        "school_id",
+        "school_print_materialized"
+      ].map((c) => `table:roster_teams.${c}`),
+      ...["team", "seq", "name_printed", "name", "yob", "dancer_id"].map((c) => `table:roster_members.${c}`),
+      ...[
+        "event_year",
+        "comp_no",
+        "team",
+        "result_address",
+        "school_id",
+        "join_kind",
+        "via_split",
+        "roster_teams",
+        "result_teams",
+        "roster_index",
+        "result_letter"
+      ].map((c) => `table:team_result_rosters.${c}`),
+      "table:event_years.event_year",
+      "table:event_years.event",
+      "table:event_years.year"
+    ],
+    since: 260,
+    calls: "teams.results, teams.rosters, teams.resultRosters (the teams index)"
+  },
+  {
+    feature: "teams.fields",
+    needs: [
+      "table:team_results.age",
+      "table:team_results.gender",
+      "table:team_results.printed_status",
+      "table:roster_teams.dance",
+      "table:roster_teams.school_print_as_of",
+      "table:roster_members.gender"
+    ],
+    since: 266,
+    calls: "the fields teams.results (age, gender, printed_status) and teams.rosters (dance, school_printed_as_of, a member's gender) carry where present: absent, never refused, on a release without them"
+  },
+  {
+    feature: "events",
+    needs: [
+      "event_year",
+      "event",
+      "year",
+      "date_lo",
+      "date_hi",
+      "resolution",
+      "source",
+      "date_printed",
+      "place",
+      "place_printed"
+    ].map((c) => `table:event_years.${c}`),
+    since: 260,
+    calls: "events.years (the events index)"
+  },
+  {
+    feature: "staff",
+    needs: [
+      "results:adjudicators",
+      "results:feis_panels",
+      "school-staff.jsonl",
+      "school-teachers.jsonl",
+      "school-registry.jsonl"
+    ],
+    since: 260,
+    calls: "staff.teacher, staff.adjudicator (the staff index)"
+  }
+];
+async function hasNeed(probe, n) {
+  const t = /^table:([A-Za-z_]+)(?:\.([A-Za-z_]+))?$/.exec(n);
+  if (t !== null) {
+    if (probe.tableColumns === undefined)
+      return false;
+    const cols = await probe.tableColumns(t[1]);
+    return t[2] === undefined ? cols.size > 0 : cols.has(t[2]);
+  }
+  const m = /^(results|majors):([A-Za-z_]+)(?:\.([A-Za-z_]+))?$/.exec(n);
+  if (m === null)
+    return probe.publishes(n);
+  const cols = columnsOf2(await probe.db(m[1]), m[2]);
+  return m[3] === undefined ? cols.size > 0 : cols.has(m[3]);
+}
+async function capabilityOf2(probe, f) {
+  const missing = [];
+  for (const n of f.needs)
+    if (!await hasNeed(probe, n))
+      missing.push(n);
+  return { ...f, state: missing.length === 0 ? "full" : "missing", missing };
+}
+function needsRelease2(tag, c) {
+  return new Error(`archive-client: ${tag} is too old for ${c.feature} (${c.calls}): it lacks ${c.missing.join(", ")}. Open a release of cut ${c.since} or later`);
+}
+
 function tagDir(root, tag) {
   if (parseArchiveTag2(tag) === null)
     throw new Error(`archive-client: "${tag}" is not a release tag (archive-YYYY.MM.DD[-N[.k]])`);
@@ -3540,4 +3723,4 @@ function releases2(opts = {}) {
   return new ReleaseManager2(opts);
 }
 
-export { DATABASES2, planAsset2, sha256File2, unzstdTo2, NAME_LEVELS2, nameLevel2, NO_CALENDAR2, FeisFinder2, columnsOf2, FEATURES2, capabilityOf2, needsRelease2, entryRank2, FEIS_LOCAL_ID_FLOOR2, ResultFinder2, MajorsFinder2, initialsOnly2, nameOrderOf, DancerResolver2, readPopulation2, canonicalOf2, CompResolver2, StaffFinder2, SchoolResolver2, TeamFinder2, EventFinder2, defaultBuilders2, indexPath2, indexKey2, isCurrent2, buildIndex2, ensureIndex2, listIndexes2, readPin2, youngest2, dancerResolverOf2, RegistrationResolver2, ghRemote2, httpsRemote2, fallbackRemote2, setRemote2, resolveTag2, Release2, openRelease2, openCached2, ReleaseManager2, releases2 };
+export { DATABASES2, planAsset2, sha256File2, unzstdTo2, NAME_LEVELS2, nameLevel2, NO_CALENDAR2, FeisFinder2, entryRank2, FEIS_LOCAL_ID_FLOOR2, ResultFinder2, MajorsFinder2, initialsOnly2, nameOrderOf, DancerResolver2, readPopulation2, canonicalOf2, CompResolver2, StaffFinder2, SchoolResolver2, TeamFinder2, EventFinder2, defaultBuilders2, indexPath2, indexKey2, isCurrent2, buildIndex2, ensureIndex2, listIndexes2, readPin2, youngest2, dancerResolverOf2, RegistrationResolver2, ghRemote2, httpsRemote2, fallbackRemote2, setRemote2, columnsOf2, FEATURES2, capabilityOf2, needsRelease2, resolveTag2, Release2, openRelease2, openCached2, ReleaseManager2, releases2 };