@finbheara/archive-client 0.7.0 → 0.9.0

package/README.md

@@ -216,11 +216,12 @@ const r = await rel.dancers.resolve({
   age: { band: "U10", year: 2026 },                // or { yob: 2016 }, or { comp: "<competition>" }
   asOf: "2026-10-17",                              // the school as of then
   population: "girls",                             // or "boys": only a contradiction excludes
+  oireachtas: { region: "SRO", year: 2026 },       // the regional the roster is for (below)
 });
 r.arm;         // "unique" | "ambiguous" | "none"
-r.candidates;  // [{ dancer_id, display, scope, score, evidence: { nameLevel, age, school }, prints, ... }]
-r.excluded;    // the candidates a contradiction set aside (why: "age" | "population")
-r.preferred;   // NON-BINDING: { dancer_id, why } where the school singles one out; never moves arm
+r.candidates;  // [{ dancer_id, display, scope, score, evidence: { nameLevel, age, school, population, region }, prints, ... }]
+r.excluded;    // the candidates a contradiction set aside (why: "age" | "population" | "region")
+r.preferred;   // NON-BINDING: { dancer_id, why } where the school (else the region) singles one out; never moves arm
 r.unlinked;    // rows printing a matched name that the release linked to no dancer
 
 await rel.dancers.search({ surname: "Quellan" });  // or { like: "a* quellan" }, or { name }
@@ -234,7 +235,17 @@ level of the names package: the print, the key, the folded key, the tokens in an
 (a middle name one print omits: `nameRelation`). `age` is how the dancer's published birth window
 meets the asked age (`Age.fitsIn`, `overlaps`): `fits`, `overlaps`, `contradicts`, `unknown`.
 `school` is how the dancer's schools meet the asked one: `same` (the latest school as of `asOf`),
-`moved` (an earlier one), `none`, `unresolved` (the print reached no school).
+`lineage` (the latest school is one the release's lineage joins to the asked one), `moved` (an
+earlier one is the asked one), `none`, `unresolved` (the print reached no school).
+
+THE LINEAGE is the release's `school-lineage.jsonl`: every line joins its `id` and its `other`,
+whatever its direction (`precedes`, `succeeds`) or shape (a rename, a split, a merger, an absorb,
+a relation), so a file carrying one end of an edge reads as one carrying both. The whole line
+joins: every school reached through any number of edges, in either direction (the two halves of a
+split are joined through their predecessor, the schools of a merger through their successor). An
+earlier row at a joined school alone is no match. `r.school.lineage` lists the ids joined to the
+asked ones. A release that publishes no lineage (feature `schools.lineage`) joins
+nothing and its answer carries no `lineage`, never refused.
 
 `population` is how the dancer's published majors population meets the asked one: `same`,
 `contradicts`, `both`, `unknown`, `unasked`. A dancer's population is read only from its rows at
@@ -251,14 +262,66 @@ majors solo competitions and in none of the asked one's (listed in `excluded`, `
 `"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 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
+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
 guess promoted. Where the school singles out one candidate, `preferred` names it with the reason,
-for a caller to weigh, and `arm` stays as counted. The `score` orders candidates and is no
+for a caller to weigh, and `arm` stays as counted. A `lineage` match ranks with `same`: one of
+each singles out neither. The `score` orders candidates and is no
 probability.
 
+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
+overseas entry excepted. The release already applies that rule to each dancer-year it publishes:
+`dancer_years.region` with `region_source = "current"` is the one regional the dancer attended that
+year, the dancer's own overseas entries left out and a year with two regionals given no `current`
+region. Where a year has no regional, an Australian or New Zealand national stands in. The client
+reads those rows and nothing else (`rel.dancers.years` serves them all).
+
+- `region` is the release's own spelling, the codes `dancer_years.region` prints (`SRO`, `MAO`,
+  `ENG_SOUTH`, ...), case folded. A region the release reads no attended year in narrows and orders
+  nothing, and `r.oireachtas.note` says so.
+- `year` is the regional's own calendar year, `asOf`'s year where none is given. The calendar year
+  is the only unit (an age is an age on 1 January of the competition's year, as
+  `@finbheara/domain/age` reads it), so a regional held in December 2026 is `year: 2026`, read
+  against `dancer_years.year` as it is, never shifted by month.
+- THE DENOMINATOR is the candidate's attended (`current`) dancer-years at or before the asked
+  year, counted on the candidate (`region.attended`). Later years are not read. A `carried` or
+  `carried-back` row is not read: it repeats an attended year, which is read directly. A `school`
+  or `cocompetitor` row is not read: it is a vote of other dancers' regions, a prior for a
+  dancer-year with no card of its own, not evidence about this one.
+- A `current` year may rest on a registration alone: a no-show still says where the dancer lives.
+  So it decides the region, and never alone a contradiction.
+- A DANCED REGIONAL is a row at a `T3` competition that year whose address is on the floor. The
+  release publishes no residence flag, and on the event roster every `T3` event is a residence
+  qualifier and every residence qualifier is `T3`, so an attended year with a `T3` row was read from
+  a regional, and one without from a national standing in for one. ON THE FLOOR is the release's
+  own absence rule, read from the row's `place_printed`, `atts` and `withdrawn`: an address with a
+  printed absence (`NS`, `DNS`, `DNA`, `No Show`, `Did Not Attend`, `Did Not Compete`, in the place
+  cell or as an `atts` token) or a DNT (`withdrawn` `DNT`, or `did-not-start` in older releases) on
+  any of its rows danced nothing there. A bare `NP` or `NR` is a dancer placed nowhere, on the
+  floor.
+
+`evidence.region` is one of:
+
+| word | counts | weight |
+|---|---|---|
+| `contradicts` | the asked year is attended in another region, and the dancer danced a regional that year: set aside (`why: "region"`) | excluded |
+| `same` | the latest attended year's region is the asked one | 2 where that year is the asked year, 1 where earlier |
+| `moved` | the latest attended year's region is another one (an earlier year, or a national in the asked year) | 0 |
+| `unknown` | no attended year at or before the asked year | 0 |
+| `unasked` | no `oireachtas` asked | 0 |
+
+`region` on a candidate is the deciding dancer-year (`{ year, region, regional, attended }`): the
+asked year where it contradicts, else the latest attended one. `moved` weighs nothing: dancers
+move, and no rate at which dancers move is measured, so it is said and never scored. Candidates
+sort by the school first, then `same` before every other region word, then `score`. Where the
+school singles out no one, `preferred` names the only candidate of the school's first rank (every
+candidate where no school is asked) whose region is `same`. The asked entry's own printed location
+is not asked, so an overseas entrant is asked without `oireachtas`. A release that publishes no
+dancer-years (feature `dancers.years`) reads every candidate `unknown`, with the note.
+
 A FEIS-LOCAL ID (`FEIS_LOCAL_ID_FLOOR`, 2^34, and up) is valid in its release only: a candidate and a result row
 carrying one say `scope: "per-release"` (`dancer_scope` on a row), so a caller never stores one
 across releases. Every answer carries the release tag.
@@ -474,7 +537,8 @@ feis's championships), the band is read from the row's own titles (`titles`, by
 domain package's title reader, the youngest again, and `age.from` says `title`. Nothing else
 stands in for a band. The dancer resolver is the release's own (`rel.dancers`, above), or the
 `dancerResolver` option. With `dancerResolver: null`, each row's dancer answers `unavailable`
-and the competitions still resolve.
+and the competitions still resolve. A row's `oireachtas`, where the list is a regional's roster,
+is passed to the dancer resolver as asked (`rel.dancers`, above).
 
 ## The command line
 
@@ -495,7 +559,7 @@ and the competitions still resolve.
     idq dancer [--release <spec>] <name> | --surname <s> | --like <glob> | --id <dancer_id>
                [--order surname-first|given-first] [--school <print|id>]
                [--yob <y> | --band <band> [--year <y>] | --comp <competition>] [--as-of <date>]
-               [--population girls|boys] [--rows]
+               [--population girls|boys] [--oireachtas <region>[:<year>]] [--rows]
     idq results [--release <spec>] [--dancer <id>] [--feis <id>] [--comp <c>] [--school <s>] [--year <y>] [--limit <n>]
     idq majors [--release <spec>] [--event <e>] [--year <y>] [--comp <c>] [--dancer <id>] [--rows]
     idq stream [--release <spec>] --scope majors|transcribed|platform|all [--entries] [--event <e,...>]
@@ -514,6 +578,7 @@ and the competitions still resolve.
     idq syllabus [--release <spec>] --for <series> [year]
     idq resolve comp [<feis> <code>] [--year y] [--title t]
     idq resolve dancer [<name>] [--school s] [--comp <feis>/<code> | --yob y | --band b --year y]
+                       [--oireachtas <region>[:<year>]]
     idq resolve registrations
 
 `stream` prints one JSON line per row (or entry), as it reads them. `dancer` prints the results of the one dancer where the answer is unique (every candidate's with
@@ -521,7 +586,8 @@ and the competitions still resolve.
 
 `resolve` speaks JSON lines: one answer per line out, and with no positional question the
 questions are JSON lines on stdin, one per line (`{feis, code, year?, title?}`,
-`{name, school?, age?, population?}`, `{name, school?, codes, feis, year?, population?}`). A line that is no JSON object,
+`{name, school?, age?, population?, oireachtas?}`,
+`{name, school?, codes, feis, year?, population?, oireachtas?}`). A line that is no JSON object,
 or no question of its kind, answers `{tag, line, error}` and the other lines still answer. The
 exit is non-zero where any line erred. A dancer's age may be given as a comp
 (`{"comp": "<feis>/<code>"}`, or `--comp` on the command line): `rel.registrations.dancer` reads

package/dist/chunks/{index-4ph8n4ga.js → index-1sj5zr8k.js}

@@ -106,6 +106,239 @@ function nameLevel2(q, c) {
   return null;
 }
 
+import { readFileSync } from "fs";
+var SCHEMA = `
+CREATE TABLE feis(
+  feis_id TEXT PRIMARY KEY, source TEXT NOT NULL, token TEXT NOT NULL, host_id TEXT NOT NULL,
+  name TEXT NOT NULL, date_lo TEXT, date_hi TEXT, date_printed TEXT, year INTEGER,
+  location TEXT, instance_id TEXT, brand_id TEXT, regions TEXT NOT NULL,
+  competitions INTEGER NOT NULL, rows INTEGER NOT NULL, captures INTEGER NOT NULL
+);
+CREATE TABLE redirect(old_id TEXT PRIMARY KEY, new_id TEXT NOT NULL, kind TEXT NOT NULL);
+`;
+var INDEXES = [
+  "CREATE INDEX feis_host ON feis(host_id COLLATE NOCASE)",
+  "CREATE INDEX feis_token ON feis(token)",
+  "CREATE INDEX feis_source ON feis(source)",
+  "CREATE INDEX feis_instance ON feis(instance_id)",
+  "CREATE INDEX feis_brand ON feis(brand_id)",
+  "CREATE INDEX feis_year ON feis(year)"
+];
+function readJsonl(path) {
+  return readFileSync(path, "utf8").split(`
+`).filter((l) => l.trim() !== "").map((l) => JSON.parse(l));
+}
+var feisesIndex = {
+  name: "feises",
+  version: "2",
+  inputs: ["results", "feis-redirects.jsonl"],
+  says: "every feis by id, platform, code, series and name, with its counts and regions",
+  build(rel, out) {
+    out.run(SCHEMA);
+    const src = rel.db("results");
+    const counts = new Map;
+    for (const r of src.query("SELECT event, count(*) AS n, json_group_array(DISTINCT feis_region) AS regions FROM competitions GROUP BY event").all())
+      counts.set(r.event, {
+        comps: r.n,
+        regions: new Set(JSON.parse(r.regions).filter((x) => x !== null))
+      });
+    const rows = new Map;
+    for (const r of src.query("SELECT c.event AS event, sum(r.n) AS n FROM (SELECT competition, count(*) AS n FROM results GROUP BY competition) r JOIN (SELECT DISTINCT competition, event FROM competitions) c ON c.competition = r.competition GROUP BY c.event").all())
+      rows.set(r.event, r.n);
+    const put = out.prepare("INSERT OR IGNORE INTO feis VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    const captures = new Map;
+    const feisRows = src.query("SELECT feis_id, source, host_id, name_printed, date_lo, date_hi, date_printed, year, location_printed, feis_instance_id, feis_brand_id FROM feises ORDER BY file, line").all();
+    for (const f of feisRows)
+      captures.set(f.feis_id, (captures.get(f.feis_id) ?? 0) + 1);
+    for (const f of feisRows) {
+      const c = counts.get(f.feis_id);
+      const colon = f.feis_id.indexOf(":");
+      put.run(f.feis_id, f.source, colon === -1 ? f.source : f.feis_id.slice(0, colon), f.host_id, f.name_printed, f.date_lo, f.date_hi, f.date_printed, f.year, f.location_printed, f.feis_instance_id, f.feis_brand_id, JSON.stringify([...c?.regions ?? []].sort()), c?.comps ?? 0, rows.get(f.feis_id) ?? 0, captures.get(f.feis_id) ?? 0);
+    }
+    const red = out.prepare("INSERT OR REPLACE INTO redirect VALUES (?, ?, ?)");
+    for (const r of readJsonl(rel.path("feis-redirects.jsonl")))
+      red.run(r.old_id, r.new_id, r.kind);
+    for (const s of INDEXES)
+      out.run(s);
+  }
+};
+var NO_CALENDAR2 = "the release holds a feis-year once its results are captured and carries no calendar of scheduled feiseanna";
+var globToLike = (g) => g.replace(/[\\%_]/g, (c) => `\\${c}`).replace(/\*/g, "%").replace(/\?/g, "_");
+
+class FeisFinder2 {
+  rel;
+  constructor(rel) {
+    this.rel = rel;
+  }
+  async dates() {
+    await this.rel.fetch("results");
+    await this.rel.require("feises.dates");
+    const dates = this.rel.db("results").query("SELECT feis_id, min(date_lo) AS date_lo, max(date_hi) AS date_hi FROM feises GROUP BY feis_id ORDER BY feis_id").all();
+    return { tag: this.rel.tag, dates };
+  }
+  async find(q) {
+    const db = await this.rel.indexDb("feises");
+    const where = [];
+    const args = [];
+    let redirected;
+    if (q.platform !== undefined) {
+      where.push("(source = ? OR token = ?)");
+      args.push(q.platform, q.platform);
+    }
+    if (q.code !== undefined) {
+      where.push("host_id = ? COLLATE NOCASE");
+      args.push(q.code);
+    }
+    if (q.id !== undefined) {
+      let id = q.id;
+      const seen = new Set;
+      for (;; ) {
+        const r = db.query("SELECT new_id FROM redirect WHERE old_id = ?").get(id);
+        if (r === null || seen.has(r.new_id))
+          break;
+        seen.add(id);
+        id = r.new_id;
+      }
+      if (id !== q.id)
+        redirected = { from: q.id, to: id };
+      where.push("(feis_id = ? OR instance_id = ? OR brand_id = ?)");
+      args.push(id, id, id);
+    }
+    if (q.name !== undefined) {
+      where.push("name LIKE ? ESCAPE '\\'");
+      args.push(globToLike(q.name));
+    }
+    if (q.year !== undefined) {
+      where.push("year = ?");
+      args.push(q.year);
+    }
+    const sql = `SELECT * FROM feis${where.length > 0 ? ` WHERE ${where.join(" AND ")}` : ""} ORDER BY date_lo, feis_id`;
+    const feises = db.query(sql).all(...args).map((r) => ({
+      ...r,
+      regions: JSON.parse(r.regions)
+    }));
+    return { tag: this.rel.tag, feises, ...redirected !== undefined ? { redirected } : {} };
+  }
+  async codeStem(token, stem) {
+    const db = await this.rel.indexDb("feises");
+    const like = db.query("SELECT host_id, year, brand_id FROM feis WHERE token = ? AND host_id LIKE ? ESCAPE '\\' COLLATE NOCASE").all(token, `${stem.replace(/[\\%_]/g, (c) => `\\${c}`)}__`);
+    const fits = like.filter((f) => {
+      const d = /(\d{2})$/.exec(f.host_id);
+      return d !== null && f.host_id.slice(0, -2).toLowerCase() === stem.toLowerCase() && f.year !== null && f.year % 100 === Number(d[1]) && f.brand_id !== null;
+    });
+    return [...new Set(fits.map((f) => f.brand_id))].sort();
+  }
+  async seriesOf(brand) {
+    const db = await this.rel.indexDb("feises");
+    const rows = db.query("SELECT * FROM feis WHERE brand_id = ? ORDER BY year, date_lo, feis_id").all(brand);
+    const byYear = new Map;
+    for (const r of rows) {
+      const i = byYear.get(r.year);
+      if (i === undefined)
+        byYear.set(r.year, {
+          year: r.year,
+          feis_ids: [r.feis_id],
+          date_lo: r.date_lo,
+          name: r.name
+        });
+      else
+        i.feis_ids.push(r.feis_id);
+    }
+    const instances = [...byYear.values()];
+    const newest = rows[rows.length - 1];
+    return {
+      series_id: brand,
+      name: newest?.name ?? "",
+      host: newest?.source ?? "",
+      hosts: [...new Set(rows.map((r) => r.source))].sort(),
+      codes: [...new Set(rows.map((r) => r.host_id))].sort(),
+      years: instances.map((i) => i.year).filter((y) => y !== null),
+      instances
+    };
+  }
+  async series(q) {
+    const asked = q.trim();
+    const answer = async (brands, via, more = {}) => {
+      const candidates = [];
+      for (const b of brands)
+        candidates.push(await this.seriesOf(b));
+      const arm = candidates.length === 0 ? "none" : candidates.length === 1 ? "unique" : "ambiguous";
+      const u = arm === "unique" ? candidates[0] : null;
+      return {
+        tag: this.rel.tag,
+        asked,
+        arm,
+        via: candidates.length === 0 ? null : via,
+        series_id: u?.series_id ?? null,
+        name: u?.name ?? null,
+        host: u?.host ?? null,
+        years: u?.years ?? [],
+        instances: u?.instances ?? [],
+        next: null,
+        ...u !== null ? { next_why: NO_CALENDAR2 } : {},
+        candidates,
+        ...arm === "ambiguous" ? { why: `${candidates.length} series answer "${asked}": ${brands.join(", ")}` } : {},
+        ...more
+      };
+    };
+    if (asked === "")
+      return answer([], null, { why: "no series was asked" });
+    const byId = await this.find({ id: asked });
+    if (byId.feises.length > 0) {
+      const brands = [...new Set(byId.feises.map((f) => f.brand_id))];
+      const filed = brands.filter((b) => b !== null).sort();
+      const redirected = byId.redirected !== undefined ? { redirected: byId.redirected } : {};
+      if (filed.length === 0)
+        return answer([], null, {
+          ...redirected,
+          why: `the release files ${byId.feises.map((f) => f.feis_id).join(", ")} under no series`
+        });
+      return answer(filed, "id", redirected);
+    }
+    const code = /^([^:\s]+):(.*?)(\d{2})?$/.exec(asked);
+    if (code !== null) {
+      const [, token, stem] = code;
+      const brands = stem === "" ? [] : await this.codeStem(token, stem);
+      if (brands.length > 0)
+        return answer(brands, "code-stem");
+    }
+    const glob = /[*?]/.test(asked) ? asked : `*${asked}*`;
+    const byName = await this.find({ name: glob });
+    const brands = [
+      ...new Set(byName.feises.map((f) => f.brand_id).filter((b) => b !== null))
+    ].sort();
+    if (brands.length > 0)
+      return answer(brands, "name");
+    return answer([], null, {
+      why: byName.feises.length > 0 ? `the feises named "${asked}" are filed under no series` : `the release holds no feis or series "${asked}"`
+    });
+  }
+}
+
+var NO_PLACE = new Set(["NP", "NR", "N/A", "NA", "NO RANK", "NORANK", "NO PLACE", "-", "--"]);
+var ABSENT = new Set(["DID NOT COMPETE", "DID NOT ATTEND", "NO SHOW", "DNA", "DNS", "NS"]);
+var ABSENT_WORDS = /not\s*attend|no\s*show/i;
+var DID_NOT_TABULATE = new Set(["DNT", "did-not-start"]);
+function printsAbsence(print) {
+  const s = print.trim();
+  if (s === "")
+    return false;
+  const upper = s.toUpperCase();
+  if (NO_PLACE.has(upper))
+    return false;
+  return ABSENT.has(upper) || ABSENT_WORDS.test(s);
+}
+function notOnTheFloor(placePrinted, atts, withdrawn) {
+  if (printsAbsence(placePrinted ?? ""))
+    return true;
+  if (atts !== null && atts !== "") {
+    for (const a of atts.split(","))
+      if (printsAbsence(a))
+        return true;
+  }
+  return withdrawn !== null && DID_NOT_TABULATE.has(withdrawn);
+}
+
 var ENTRY_RANK = new Map([
   ["final", 0],
   ["", 1],
@@ -375,6 +608,7 @@ class MajorsFinder2 {
   }
 }
 
+var LINEAGE_FILE = "school-lineage.jsonl";
 function nameOrderOf(s) {
   return s === "surname-first" || s === "given-first" || s === "unknown" ? s : undefined;
 }
@@ -387,7 +621,7 @@ var PERSON = { table: "person", value: "id", valueType: "INTEGER PRIMARY KEY" };
 var ASKED = ["surname_key", "nn4", "blk_surname"];
 var dancersIndex = {
   name: "dancers",
-  version: "2",
+  version: "4",
   inputs: ["results"],
   keyParts: () => [...PACKAGE_KEY_PARTS],
   says: "every published dancer print at the names package's keys, its dancers, schools and years",
@@ -398,6 +632,7 @@ var dancersIndex = {
     out.run("CREATE TABLE dancer(dancer_id INTEGER PRIMARY KEY, display TEXT NOT NULL, names_printed TEXT NOT NULL, genders TEXT NOT NULL, appearances INTEGER NOT NULL, kind TEXT, birth_lo INTEGER, birth_hi INTEGER, birth_source TEXT NOT NULL, birth_conflict INTEGER NOT NULL, rows INTEGER NOT NULL, year_lo INTEGER, year_hi INTEGER)");
     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");
     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,
@@ -472,6 +707,25 @@ var dancersIndex = {
       if (pop === "girls" || pop === "boys")
         putPop.run(r.d, pop, r.n);
     }
+    if (src.query("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'dancer_years'").get() !== null) {
+      const cols = new Set(src.query("PRAGMA table_info(results)").all().map((c) => c.name));
+      const col = (c) => cols.has(c) ? `r.${c}` : "NULL";
+      const rows = src.query(`SELECT r.dancer_id AS d, c.year AS y, r.address AS a, ${col("place_printed")} AS p,
+					        ${col("atts")} AS t, ${col("withdrawn")} AS w
+					 FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line
+					 WHERE r.dancer_id IS NOT NULL AND c.tier = 'T3' AND c.year IS NOT NULL`).all();
+      const absent = new Set;
+      for (const r of rows)
+        if (notOnTheFloor(r.p, r.t, r.w))
+          absent.add(r.a);
+      const t3 = new Set;
+      for (const r of rows)
+        if (!absent.has(r.a))
+          t3.add(`${r.d}\x00${r.y}`);
+      const putReg = out.prepare("INSERT INTO dancer_regional VALUES (?, ?, ?, ?)");
+      for (const r of src.query("SELECT dancer_id AS d, year AS y, region AS r FROM dancer_years WHERE region_source = 'current' AND region IS NOT NULL").all())
+        putReg.run(r.d, r.y, r.r, t3.has(`${r.d}\x00${r.y}`) ? 1 : 0);
+    }
     for (const s of schema.indexes)
       if (ASKED.some((c) => s.endsWith(`(${c})`)))
         out.run(s);
@@ -506,11 +760,17 @@ var AGE_WEIGHT = {
 };
 var SCHOOL_RANK = {
   same: 0,
+  lineage: 0,
   moved: 1,
   none: 2,
   unresolved: 2,
   unasked: 2
 };
+var PREFERRED_WHY = {
+  same: "whose latest school is",
+  lineage: "whose latest school the release's lineage joins to",
+  moved: "that ever danced for"
+};
 var POPULATION_WEIGHT = {
   same: 1,
   both: 0,
@@ -518,8 +778,24 @@ var POPULATION_WEIGHT = {
   unasked: 0,
   contradicts: -10
 };
+var REGION_WEIGHT = {
+  same: 1,
+  unknown: 0,
+  unasked: 0,
+  moved: 0,
+  contradicts: -10
+};
+var REGION_SAME_THAT_YEAR = 2;
+var REGION_RANK = {
+  same: 0,
+  unknown: 1,
+  unasked: 1,
+  moved: 1,
+  contradicts: 2
+};
 var SCHOOL_WEIGHT = {
   same: 2,
+  lineage: 2,
   moved: 1,
   none: 0,
   unresolved: 0,
@@ -535,9 +811,31 @@ function idChunks(ids) {
 class DancerResolver2 {
   rel;
   printIds = new Map;
+  lineageOf;
+  regions;
   constructor(rel) {
     this.rel = rel;
   }
+  lineage() {
+    this.lineageOf ??= (async () => {
+      if ((await this.rel.capability("schools.lineage")).state !== "full")
+        return null;
+      await this.rel.fetch(LINEAGE_FILE);
+      const out = new Map;
+      const join = (a, b) => {
+        const s = out.get(a) ?? new Set;
+        s.add(b);
+        out.set(a, s);
+      };
+      for (const r of readJsonl(this.rel.path(LINEAGE_FILE)))
+        if (r.id !== r.other) {
+          join(r.id, r.other);
+          join(r.other, r.id);
+        }
+      return out;
+    })();
+    return this.lineageOf;
+  }
   async records(q = {}) {
     await this.rel.fetch("results");
     await this.rel.require("dancers.records");
@@ -642,12 +940,29 @@ class DancerResolver2 {
     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);
+    const oireachtas = q.oireachtas === undefined ? undefined : await this.readOireachtas(db, q.oireachtas, asOf);
     let schoolIds = null;
+    let lineageIds = [];
     let school;
     if (q.school !== undefined) {
       const s = await this.rel.schools.resolve(q.school);
       schoolIds = s.candidates.map((c) => c.school_id);
-      school = { arm: s.arm, ids: schoolIds };
+      const lineage = await this.lineage();
+      if (lineage === null)
+        school = { arm: s.arm, ids: schoolIds };
+      else {
+        const asked = new Set(schoolIds);
+        const reached = new Set(schoolIds);
+        const todo = [...schoolIds];
+        for (let id = todo.pop();id !== undefined; id = todo.pop())
+          for (const o of lineage.get(id) ?? [])
+            if (!reached.has(o)) {
+              reached.add(o);
+              todo.push(o);
+            }
+        lineageIds = [...reached].filter((id) => !asked.has(id)).sort();
+        school = { arm: s.arm, ids: schoolIds, lineage: lineageIds };
+      }
     }
     const byDancer = new Map;
     const unlinked = new Map;
@@ -674,24 +989,37 @@ class DancerResolver2 {
       const ageEv = ageEvidence(d, age?.age ?? null);
       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, asOf);
+      const schoolEv = schoolIds === null ? "unasked" : schoolIds.length === 0 ? "unresolved" : await this.schoolEvidence(schools, schoolIds, lineageIds, asOf);
+      const reg = oireachtas === undefined ? null : oireachtas.read === null ? {
+        word: "unknown",
+        region: { year: null, region: null, regional: false, attended: 0 }
+      } : regionEvidence(db, id, oireachtas.read, oireachtas.year);
+      const regionEv = reg === null ? "unasked" : reg.word;
+      const regionWeight = regionEv === "same" && reg?.region.year === oireachtas?.year ? REGION_SAME_THAT_YEAR : REGION_WEIGHT[regionEv];
       all.push({
         dancer_id: id,
         display: d.display,
         scope: id >= FEIS_LOCAL_ID_FLOOR2 ? "per-release" : "stable",
         kind: d.kind,
-        score: NAME_WEIGHT[e.level] + AGE_WEIGHT[ageEv] + SCHOOL_WEIGHT[schoolEv] + POPULATION_WEIGHT[popEv],
-        evidence: { nameLevel: e.level, age: ageEv, school: schoolEv, population: popEv },
+        score: NAME_WEIGHT[e.level] + AGE_WEIGHT[ageEv] + SCHOOL_WEIGHT[schoolEv] + POPULATION_WEIGHT[popEv] + regionWeight,
+        evidence: {
+          nameLevel: e.level,
+          age: ageEv,
+          school: schoolEv,
+          population: popEv,
+          region: regionEv
+        },
         prints: e.prints.sort((a, b) => b.rows - a.rows || (a.print < b.print ? -1 : 1)),
         rows: d.rows,
         year_lo: d.year_lo,
         year_hi: d.year_hi,
         birth: birthOf(d),
         population: pop,
-        school: latest
+        school: latest,
+        ...reg !== null ? { region: reg.region } : {}
       });
     }
-    all.sort((a, b) => SCHOOL_RANK[a.evidence.school] - SCHOOL_RANK[b.evidence.school] || b.score - a.score || b.rows - a.rows || a.dancer_id - b.dancer_id);
+    all.sort((a, b) => SCHOOL_RANK[a.evidence.school] - SCHOOL_RANK[b.evidence.school] || REGION_RANK[a.evidence.region] - REGION_RANK[b.evidence.region] || b.score - a.score || b.rows - a.rows || a.dancer_id - b.dancer_id);
     const excluded = [];
     let kept = all;
     if (narrow)
@@ -700,23 +1028,38 @@ class DancerResolver2 {
           excluded.push({ candidate: c, why: "age" });
         else if (c.evidence.population === "contradicts")
           excluded.push({ candidate: c, why: "population" });
+        else if (c.evidence.region === "contradicts")
+          excluded.push({ candidate: c, why: "region" });
         else
           return true;
         return false;
       });
     let preferred;
     if (kept.length > 1 && school !== undefined)
-      for (const ev of ["same", "moved"]) {
-        const hit = kept.filter((c) => SCHOOL_RANK[c.evidence.school] === SCHOOL_RANK[ev]);
+      for (const rank of [SCHOOL_RANK.same, SCHOOL_RANK.moved]) {
+        const hit = kept.filter((c) => SCHOOL_RANK[c.evidence.school] === rank);
         if (hit.length === 0)
           continue;
-        if (hit.length === 1)
+        if (hit.length === 1) {
+          const c = hit[0];
           preferred = {
-            dancer_id: hit[0].dancer_id,
-            why: `the only candidate ${ev === "same" ? "whose latest school is" : "that ever danced for"} ${q.school}`
+            dancer_id: c.dancer_id,
+            why: `the only candidate ${PREFERRED_WHY[c.evidence.school]} ${q.school}`
           };
+        }
         break;
       }
+    if (preferred === undefined && kept.length > 1 && oireachtas?.read != null) {
+      const best = Math.min(...kept.map((c) => SCHOOL_RANK[c.evidence.school]));
+      const hit = kept.filter((c) => SCHOOL_RANK[c.evidence.school] === best && c.evidence.region === "same");
+      if (hit.length === 1) {
+        const c = hit[0];
+        preferred = {
+          dancer_id: c.dancer_id,
+          why: `the only candidate${school !== undefined ? " of the school's first rank" : ""} whose latest attended region is ${oireachtas.read}: ${c.region?.year} of ${c.region?.attended} attended year(s) to ${oireachtas.year}`
+        };
+      }
+    }
     return {
       tag: this.rel.tag,
       asked: q,
@@ -727,32 +1070,59 @@ class DancerResolver2 {
       unlinked: [...unlinked].map(([print, rows]) => ({ print, rows })).sort((a, b) => b.rows - a.rows || (a.print < b.print ? -1 : 1)),
       ...age !== undefined ? { age: age.answer } : {},
       ...population !== undefined ? { population } : {},
+      ...oireachtas !== undefined ? { oireachtas } : {},
       ...school !== undefined ? { school } : {}
     };
   }
-  async schoolEvidence(schools, ids, asOf) {
+  async readOireachtas(db, o, asOf) {
+    const year = o.year ?? asOf ?? new Date().getFullYear();
+    const asked = o.region;
+    if ((await this.rel.capability("dancers.years")).state !== "full")
+      return {
+        asked,
+        read: null,
+        year,
+        note: "this release publishes no dancer-years: the region narrows and orders nothing"
+      };
+    this.regions ??= db.query("SELECT DISTINCT region FROM dancer_regional ORDER BY region").all().map((r) => r.region);
+    const want = asked.trim().toUpperCase();
+    const hit = this.regions.find((r) => r.toUpperCase() === want);
+    if (hit === undefined)
+      return {
+        asked,
+        read: null,
+        year,
+        note: `the release reads no attended year in a region "${asked}" (its spelling is dancer_years.region): it narrows and orders nothing`
+      };
+    return { asked, read: hit, year };
+  }
+  async schoolEvidence(schools, ids, lineage, asOf) {
     const rows = schools.filter((s) => asOf === null || s.year_lo === null || s.year_lo <= asOf);
-    const meets = async (s) => {
+    const idsOf = async (s) => {
       if (s.school_id !== null)
-        return ids.includes(s.school_id);
+        return [s.school_id];
       let read = this.printIds.get(s.print);
       if (read === undefined) {
         read = (await this.rel.schools.resolve(s.print)).candidates.map((c) => c.school_id);
         this.printIds.set(s.print, read);
       }
-      return read.some((id) => ids.includes(id));
+      return read;
     };
     const top = (s) => asOf !== null && s.year_hi !== null ? Math.min(s.year_hi, asOf) : s.year_hi ?? -1;
     const latest = Math.max(-1, ...rows.map(top));
     let earlier = false;
+    let joined = false;
     for (const s of rows) {
-      if (!await meets(s))
-        continue;
-      if (top(s) === latest)
-        return "same";
-      earlier = true;
+      const own = await idsOf(s);
+      const isLatest = top(s) === latest;
+      if (own.some((id) => ids.includes(id))) {
+        if (isLatest)
+          return "same";
+        earlier = true;
+      } else if (isLatest && own.some((id) => lineage.includes(id)))
+        joined = true;
     }
-    return earlier ? "moved" : "none";
+    return joined ? "lineage" : earlier ? "moved" : "none";
   }
   readAge(a, asOf) {
     const done = (age, note) => {
@@ -832,6 +1202,22 @@ function populationEvidence(own, asked) {
     return "unknown";
   return populationRelation(asked, mine) === "disjoint" ? "contradicts" : "same";
 }
+function regionEvidence(db, dancerId, region, year) {
+  const rows = db.query("SELECT year, region, regional FROM dancer_regional WHERE dancer_id = ? AND year <= ? ORDER BY year").all(dancerId, year);
+  const attended = rows.length;
+  const at = (r) => ({
+    year: r.year,
+    region: r.region,
+    regional: r.regional === 1,
+    attended
+  });
+  const latest = rows.at(-1);
+  if (latest === undefined)
+    return { word: "unknown", region: { year: null, region: null, regional: false, attended } };
+  if (latest.year === year && latest.regional === 1 && latest.region !== region)
+    return { word: "contradicts", region: at(latest) };
+  return { word: latest.region === region ? "same" : "moved", region: at(latest) };
+}
 function ageEvidence(d, asked) {
   if (asked === null)
     return "unasked";
@@ -865,7 +1251,7 @@ var LEVEL = Object.freeze({
   600: "PC",
   700: "OC"
 });
-var SCHEMA = `
+var SCHEMA2 = `
 CREATE TABLE comp(
   competition TEXT PRIMARY KEY, feis_id TEXT NOT NULL, brand_id TEXT, year INTEGER,
   code TEXT NOT NULL, code_fold TEXT NOT NULL, title TEXT, age TEXT, gender TEXT,
@@ -874,7 +1260,7 @@ CREATE TABLE comp(
   gender_source TEXT, level_printed TEXT, dance_printed TEXT, dance TEXT
 );
 `;
-var INDEXES = [
+var INDEXES2 = [
   "CREATE INDEX comp_feis_code ON comp(feis_id, code_fold)",
   "CREATE INDEX comp_brand_year ON comp(brand_id, year)"
 ];
@@ -893,7 +1279,7 @@ var compsIndex = {
   inputs: ["results"],
   says: "every competition by its feis and its own code, with its series and year",
   build(rel, out) {
-    out.run(SCHEMA);
+    out.run(SCHEMA2);
     const src = rel.db("results");
     const brand = new Map;
     for (const f of src.query("SELECT feis_id, feis_brand_id, year FROM feises ORDER BY file, line").all())
@@ -909,7 +1295,7 @@ var compsIndex = {
       const f = brand.get(c.event);
       put.run(c.competition, c.event, f?.brand ?? null, c.year ?? f?.year ?? null, c.comp_no.trim(), fold(c.comp_no), c.title, c.age, c.gender, c.feis_level, c.round, c.source, captures.get(c.competition) ?? 1, c.file, c.line, c.age_source, c.age_printed, c.gender_source, c.level_printed, c.dance_printed, c.dance);
     }
-    for (const s of INDEXES)
+    for (const s of INDEXES2)
       out.run(s);
   }
 };
@@ -1199,215 +1585,6 @@ class CompResolver2 {
   }
 }
 
-import { readFileSync } from "fs";
-var SCHEMA2 = `
-CREATE TABLE feis(
-  feis_id TEXT PRIMARY KEY, source TEXT NOT NULL, token TEXT NOT NULL, host_id TEXT NOT NULL,
-  name TEXT NOT NULL, date_lo TEXT, date_hi TEXT, date_printed TEXT, year INTEGER,
-  location TEXT, instance_id TEXT, brand_id TEXT, regions TEXT NOT NULL,
-  competitions INTEGER NOT NULL, rows INTEGER NOT NULL, captures INTEGER NOT NULL
-);
-CREATE TABLE redirect(old_id TEXT PRIMARY KEY, new_id TEXT NOT NULL, kind TEXT NOT NULL);
-`;
-var INDEXES2 = [
-  "CREATE INDEX feis_host ON feis(host_id COLLATE NOCASE)",
-  "CREATE INDEX feis_token ON feis(token)",
-  "CREATE INDEX feis_source ON feis(source)",
-  "CREATE INDEX feis_instance ON feis(instance_id)",
-  "CREATE INDEX feis_brand ON feis(brand_id)",
-  "CREATE INDEX feis_year ON feis(year)"
-];
-function readJsonl(path) {
-  return readFileSync(path, "utf8").split(`
-`).filter((l) => l.trim() !== "").map((l) => JSON.parse(l));
-}
-var feisesIndex = {
-  name: "feises",
-  version: "2",
-  inputs: ["results", "feis-redirects.jsonl"],
-  says: "every feis by id, platform, code, series and name, with its counts and regions",
-  build(rel, out) {
-    out.run(SCHEMA2);
-    const src = rel.db("results");
-    const counts = new Map;
-    for (const r of src.query("SELECT event, count(*) AS n, json_group_array(DISTINCT feis_region) AS regions FROM competitions GROUP BY event").all())
-      counts.set(r.event, {
-        comps: r.n,
-        regions: new Set(JSON.parse(r.regions).filter((x) => x !== null))
-      });
-    const rows = new Map;
-    for (const r of src.query("SELECT c.event AS event, sum(r.n) AS n FROM (SELECT competition, count(*) AS n FROM results GROUP BY competition) r JOIN (SELECT DISTINCT competition, event FROM competitions) c ON c.competition = r.competition GROUP BY c.event").all())
-      rows.set(r.event, r.n);
-    const put = out.prepare("INSERT OR IGNORE INTO feis VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-    const captures = new Map;
-    const feisRows = src.query("SELECT feis_id, source, host_id, name_printed, date_lo, date_hi, date_printed, year, location_printed, feis_instance_id, feis_brand_id FROM feises ORDER BY file, line").all();
-    for (const f of feisRows)
-      captures.set(f.feis_id, (captures.get(f.feis_id) ?? 0) + 1);
-    for (const f of feisRows) {
-      const c = counts.get(f.feis_id);
-      const colon = f.feis_id.indexOf(":");
-      put.run(f.feis_id, f.source, colon === -1 ? f.source : f.feis_id.slice(0, colon), f.host_id, f.name_printed, f.date_lo, f.date_hi, f.date_printed, f.year, f.location_printed, f.feis_instance_id, f.feis_brand_id, JSON.stringify([...c?.regions ?? []].sort()), c?.comps ?? 0, rows.get(f.feis_id) ?? 0, captures.get(f.feis_id) ?? 0);
-    }
-    const red = out.prepare("INSERT OR REPLACE INTO redirect VALUES (?, ?, ?)");
-    for (const r of readJsonl(rel.path("feis-redirects.jsonl")))
-      red.run(r.old_id, r.new_id, r.kind);
-    for (const s of INDEXES2)
-      out.run(s);
-  }
-};
-var NO_CALENDAR2 = "the release holds a feis-year once its results are captured and carries no calendar of scheduled feiseanna";
-var globToLike = (g) => g.replace(/[\\%_]/g, (c) => `\\${c}`).replace(/\*/g, "%").replace(/\?/g, "_");
-
-class FeisFinder2 {
-  rel;
-  constructor(rel) {
-    this.rel = rel;
-  }
-  async dates() {
-    await this.rel.fetch("results");
-    await this.rel.require("feises.dates");
-    const dates = this.rel.db("results").query("SELECT feis_id, min(date_lo) AS date_lo, max(date_hi) AS date_hi FROM feises GROUP BY feis_id ORDER BY feis_id").all();
-    return { tag: this.rel.tag, dates };
-  }
-  async find(q) {
-    const db = await this.rel.indexDb("feises");
-    const where = [];
-    const args = [];
-    let redirected;
-    if (q.platform !== undefined) {
-      where.push("(source = ? OR token = ?)");
-      args.push(q.platform, q.platform);
-    }
-    if (q.code !== undefined) {
-      where.push("host_id = ? COLLATE NOCASE");
-      args.push(q.code);
-    }
-    if (q.id !== undefined) {
-      let id = q.id;
-      const seen = new Set;
-      for (;; ) {
-        const r = db.query("SELECT new_id FROM redirect WHERE old_id = ?").get(id);
-        if (r === null || seen.has(r.new_id))
-          break;
-        seen.add(id);
-        id = r.new_id;
-      }
-      if (id !== q.id)
-        redirected = { from: q.id, to: id };
-      where.push("(feis_id = ? OR instance_id = ? OR brand_id = ?)");
-      args.push(id, id, id);
-    }
-    if (q.name !== undefined) {
-      where.push("name LIKE ? ESCAPE '\\'");
-      args.push(globToLike(q.name));
-    }
-    if (q.year !== undefined) {
-      where.push("year = ?");
-      args.push(q.year);
-    }
-    const sql = `SELECT * FROM feis${where.length > 0 ? ` WHERE ${where.join(" AND ")}` : ""} ORDER BY date_lo, feis_id`;
-    const feises = db.query(sql).all(...args).map((r) => ({
-      ...r,
-      regions: JSON.parse(r.regions)
-    }));
-    return { tag: this.rel.tag, feises, ...redirected !== undefined ? { redirected } : {} };
-  }
-  async codeStem(token, stem) {
-    const db = await this.rel.indexDb("feises");
-    const like = db.query("SELECT host_id, year, brand_id FROM feis WHERE token = ? AND host_id LIKE ? ESCAPE '\\' COLLATE NOCASE").all(token, `${stem.replace(/[\\%_]/g, (c) => `\\${c}`)}__`);
-    const fits = like.filter((f) => {
-      const d = /(\d{2})$/.exec(f.host_id);
-      return d !== null && f.host_id.slice(0, -2).toLowerCase() === stem.toLowerCase() && f.year !== null && f.year % 100 === Number(d[1]) && f.brand_id !== null;
-    });
-    return [...new Set(fits.map((f) => f.brand_id))].sort();
-  }
-  async seriesOf(brand) {
-    const db = await this.rel.indexDb("feises");
-    const rows = db.query("SELECT * FROM feis WHERE brand_id = ? ORDER BY year, date_lo, feis_id").all(brand);
-    const byYear = new Map;
-    for (const r of rows) {
-      const i = byYear.get(r.year);
-      if (i === undefined)
-        byYear.set(r.year, {
-          year: r.year,
-          feis_ids: [r.feis_id],
-          date_lo: r.date_lo,
-          name: r.name
-        });
-      else
-        i.feis_ids.push(r.feis_id);
-    }
-    const instances = [...byYear.values()];
-    const newest = rows[rows.length - 1];
-    return {
-      series_id: brand,
-      name: newest?.name ?? "",
-      host: newest?.source ?? "",
-      hosts: [...new Set(rows.map((r) => r.source))].sort(),
-      codes: [...new Set(rows.map((r) => r.host_id))].sort(),
-      years: instances.map((i) => i.year).filter((y) => y !== null),
-      instances
-    };
-  }
-  async series(q) {
-    const asked = q.trim();
-    const answer = async (brands, via, more = {}) => {
-      const candidates = [];
-      for (const b of brands)
-        candidates.push(await this.seriesOf(b));
-      const arm = candidates.length === 0 ? "none" : candidates.length === 1 ? "unique" : "ambiguous";
-      const u = arm === "unique" ? candidates[0] : null;
-      return {
-        tag: this.rel.tag,
-        asked,
-        arm,
-        via: candidates.length === 0 ? null : via,
-        series_id: u?.series_id ?? null,
-        name: u?.name ?? null,
-        host: u?.host ?? null,
-        years: u?.years ?? [],
-        instances: u?.instances ?? [],
-        next: null,
-        ...u !== null ? { next_why: NO_CALENDAR2 } : {},
-        candidates,
-        ...arm === "ambiguous" ? { why: `${candidates.length} series answer "${asked}": ${brands.join(", ")}` } : {},
-        ...more
-      };
-    };
-    if (asked === "")
-      return answer([], null, { why: "no series was asked" });
-    const byId = await this.find({ id: asked });
-    if (byId.feises.length > 0) {
-      const brands = [...new Set(byId.feises.map((f) => f.brand_id))];
-      const filed = brands.filter((b) => b !== null).sort();
-      const redirected = byId.redirected !== undefined ? { redirected: byId.redirected } : {};
-      if (filed.length === 0)
-        return answer([], null, {
-          ...redirected,
-          why: `the release files ${byId.feises.map((f) => f.feis_id).join(", ")} under no series`
-        });
-      return answer(filed, "id", redirected);
-    }
-    const code = /^([^:\s]+):(.*?)(\d{2})?$/.exec(asked);
-    if (code !== null) {
-      const [, token, stem] = code;
-      const brands = stem === "" ? [] : await this.codeStem(token, stem);
-      if (brands.length > 0)
-        return answer(brands, "code-stem");
-    }
-    const glob = /[*?]/.test(asked) ? asked : `*${asked}*`;
-    const byName = await this.find({ name: glob });
-    const brands = [
-      ...new Set(byName.feises.map((f) => f.brand_id).filter((b) => b !== null))
-    ].sort();
-    if (brands.length > 0)
-      return answer(brands, "name");
-    return answer([], null, {
-      why: byName.feises.length > 0 ? `the feises named "${asked}" are filed under no series` : `the release holds no feis or series "${asked}"`
-    });
-  }
-}
-
 import { Database } from "bun:sqlite";
 import { createHash as createHash2 } from "crypto";
 import { existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync } from "fs";
@@ -2286,7 +2463,8 @@ class RegistrationResolver2 {
         ...row.school !== undefined ? { school: row.school } : {},
         ...age !== null ? { age: { band: age.band, year: age.year } } : {},
         ...row.asOf !== undefined ? { asOf: row.asOf } : {},
-        ...population !== null && "asked" in population ? { population: population.asked } : {}
+        ...population !== null && "asked" in population ? { population: population.asked } : {},
+        ...row.oireachtas !== undefined ? { oireachtas: row.oireachtas } : {}
       };
       const { dancer } = await this.dancer(asked);
       out.push({
@@ -2517,6 +2695,12 @@ var FEATURES2 = [
     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: [
@@ -3229,4 +3413,4 @@ function releases2(opts = {}) {
   return new ReleaseManager2(opts);
 }
 
-export { DATABASES2, planAsset2, sha256File2, unzstdTo2, NAME_LEVELS2, nameLevel2, entryRank2, FEIS_LOCAL_ID_FLOOR2, ResultFinder2, MajorsFinder2, nameOrderOf, DancerResolver2, readPopulation2, canonicalOf2, CompResolver2, NO_CALENDAR2, FeisFinder2, 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 };
+export { DATABASES2, planAsset2, sha256File2, unzstdTo2, NAME_LEVELS2, nameLevel2, NO_CALENDAR2, FeisFinder2, entryRank2, FEIS_LOCAL_ID_FLOOR2, ResultFinder2, MajorsFinder2, 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 };

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   nameOrderOf,
   openRelease2,
   releases2
-} from "./chunks/index-4ph8n4ga.js";
+} from "./chunks/index-1sj5zr8k.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 
@@ -40,9 +40,12 @@ var USAGE = `usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json]
   dancer [--release <spec>] <name> | --surname <s> | --like <glob> | --id <dancer_id>
          [--order surname-first|given-first] [--school <print|id>]
          [--yob <y> | --band <U10> [--year <y>] | --comp <competition>] [--as-of <date>]
-         [--population girls|boys] [--rows]
+         [--population girls|boys] [--oireachtas <region>[:<year>]] [--rows]
                                     the dancers a name reaches, each with its evidence
-                                    (name level, age, school, population) and the arm; the results of
+                                    (name level, age, school, population, region) and the arm;
+                                    --oireachtas is the regional the roster is for, its region in
+                                    the release's spelling (SRO, MAO), its year the --as-of year
+                                    where none is given; the results of
                                     the one dancer where one answers (or --rows for each)
   results [--release <spec>] [--dancer <id>] [--feis <id>] [--comp <competition>]
           [--school <print|id>] [--year <y>] [--limit <n>]
@@ -87,12 +90,13 @@ var USAGE = `usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json]
   resolve comp [<feis> <code>] [--year <y>] [--title <t>]
   resolve dancer [<name>] [--school <s>] [--comp <feis>/<code> | --yob <y> | --band <b> --year <y>]
                  [--order <o>] [--as-of <date>] [--population girls|boys]
+                 [--oireachtas <region>[:<year>]]
   resolve registrations
                                     JSONL out, one answer per line; with no positional the
                                     questions are JSONL on stdin, one per line (a comp:
                                     {feis, code, year?, title?}, a dancer: {name, school?, age?,
-                                    population?}, a registration: {name, school?, codes[], feis,
-                                    year?, population?})
+                                    population?, oireachtas?}, a registration: {name, school?,
+                                    codes[], feis, year?, population?, oireachtas?})
 
   <spec>: pinned (the default) | latest | a cut (42, 42.1) | a tag (archive-YYYY.MM.DD-N)`;
 var VALUE = new Set([
@@ -117,6 +121,7 @@ var VALUE = new Set([
   "--comp",
   "--as-of",
   "--population",
+  "--oireachtas",
   "--dancer",
   "--feis",
   "--limit",
@@ -169,7 +174,9 @@ function printCached(c, say) {
 }
 var span = (lo, hi) => lo === null ? "-" : lo === hi ? `${lo}` : `${lo}-${hi ?? "?"}`;
 function printCandidate(c, say, pad = "  ") {
-  say(`${pad}${c.dancer_id}  ${c.display}${c.scope === "per-release" ? "  [per-release id]" : ""}  score ${c.score}  name ${c.evidence.nameLevel}  age ${c.evidence.age}  school ${c.evidence.school}  population ${c.evidence.population}`);
+  say(`${pad}${c.dancer_id}  ${c.display}${c.scope === "per-release" ? "  [per-release id]" : ""}  score ${c.score}  name ${c.evidence.nameLevel}  age ${c.evidence.age}  school ${c.evidence.school}  population ${c.evidence.population}  region ${c.evidence.region}`);
+  if (c.region !== undefined)
+    say(`${pad}    region ${c.region.region === null ? "-" : `${c.region.region} ${c.region.year}${c.region.regional ? " (regional)" : ""}`}  attended ${c.region.attended} year(s)`);
   say(`${pad}    ${c.rows} rows ${span(c.year_lo, c.year_hi)}  born ${span(c.birth.lo, c.birth.hi)} (${c.birth.source})  majors girls ${c.population.girls} boys ${c.population.boys}  school ${c.school === null ? "-" : `${c.school.school_id ?? "(no id)"} "${c.school.print}" ${span(c.school.year_lo, c.school.year_hi)}`}`);
   say(`${pad}    prints ${c.prints.slice(0, 5).map((p) => `"${p.print}" (${p.rows}, ${p.level})`).join(", ")}${c.prints.length > 5 ? `, +${c.prints.length - 5} more` : ""}`);
 }
@@ -178,9 +185,11 @@ function printDancers(a, say) {
   if (a.age !== undefined)
     say(`  age asked: ${a.age.read ?? "(unread)"}${a.age.birth !== null ? ` born ${a.age.birth.from ?? "?"}-${a.age.birth.to ?? "?"}` : ""}${a.age.note !== undefined ? `  (${a.age.note})` : ""}`);
   if (a.school !== undefined)
-    say(`  school asked: ${a.school.arm} ${a.school.ids.join(", ") || "-"}`);
+    say(`  school asked: ${a.school.arm} ${a.school.ids.join(", ") || "-"}${a.school.lineage !== undefined && a.school.lineage.length > 0 ? `  (lineage: ${a.school.lineage.join(", ")})` : ""}`);
   if (a.population !== undefined)
     say(`  population asked: ${a.population.read ?? "(unread)"}${a.population.note !== undefined ? `  (${a.population.note})` : ""}`);
+  if (a.oireachtas !== undefined)
+    say(`  oireachtas asked: ${a.oireachtas.read ?? "(unread)"} ${a.oireachtas.year}${a.oireachtas.note !== undefined ? `  (${a.oireachtas.note})` : ""}`);
   for (const c of a.candidates)
     printCandidate(c, say);
   if (a.preferred !== undefined)
@@ -253,6 +262,14 @@ function jsonLines(text, check) {
   return out;
 }
 var checkComp = (q) => typeof q.feis !== "string" || q.feis.trim() === "" ? "a comp question needs feis" : q.code === undefined || q.code === null || String(q.code).trim() === "" ? "a comp question needs code" : null;
+function oireachtasFlag(v) {
+  if (v === undefined)
+    return {};
+  const m = /^(.*?):(\d{4})$/.exec(v.trim());
+  return {
+    oireachtas: m === null ? { region: v.trim() } : { region: m[1], year: Number(m[2]) }
+  };
+}
 var checkDancer = (q) => typeof q.name !== "string" || q.name.trim() === "" ? "a dancer question needs name" : null;
 var checkRegistration = (r) => typeof r.name !== "string" || r.name.trim() === "" ? "a registration row needs name" : typeof r.feis !== "string" || r.feis.trim() === "" ? "a registration row needs feis" : !Array.isArray(r.codes) ? "a registration row needs codes[]" : null;
 async function resolveVerb(rel, what, args, p, say, stdin) {
@@ -312,7 +329,8 @@ async function resolveVerb(rel, what, args, p, say, stdin) {
               ...p.flags.has("--school") ? { school: p.flags.get("--school") } : {},
               ...age !== undefined ? { age } : {},
               ...p.flags.has("--as-of") ? { asOf: p.flags.get("--as-of") } : {},
-              ...p.flags.has("--population") ? { population: p.flags.get("--population") } : {}
+              ...p.flags.has("--population") ? { population: p.flags.get("--population") } : {},
+              ...oireachtasFlag(p.flags.get("--oireachtas"))
             }
           }
         ];
@@ -619,6 +637,7 @@ async function main(argv, io = {}) {
             ...age !== undefined ? { age } : {},
             ...p.flags.has("--as-of") ? { asOf: p.flags.get("--as-of") } : {},
             ...p.flags.has("--population") ? { population: p.flags.get("--population") } : {},
+            ...oireachtasFlag(p.flags.get("--oireachtas")),
             ...p.flags.has("--limit") ? { limit: Number(p.flags.get("--limit")) } : {}
           };
           const surname = p.flags.get("--surname");

package/dist/index.js

@@ -6,6 +6,8 @@ import {
   unzstdTo2,
   NAME_LEVELS2,
   nameLevel2,
+  NO_CALENDAR2,
+  FeisFinder2,
   entryRank2,
   FEIS_LOCAL_ID_FLOOR2,
   ResultFinder2,
@@ -14,8 +16,6 @@ import {
   readPopulation2,
   canonicalOf2,
   CompResolver2,
-  NO_CALENDAR2,
-  FeisFinder2,
   StaffFinder2,
   SchoolResolver2,
   TeamFinder2,
@@ -45,7 +45,7 @@ import {
   openCached2,
   ReleaseManager2,
   releases2
-} from "./chunks/index-4ph8n4ga.js";
+} from "./chunks/index-1sj5zr8k.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/cli.d.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 import type { OpenOptions } from "./release.js";
 import type { StreamQuery } from "./stream.js";
-export declare const USAGE = "usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json]\n\n  config repo <owner/name>          set the user-local repository the releases come from\n  list [--remote]                   the cached releases (size, files, indexes, the pin), and\n                                    with --remote the published tags\n  fetch [--release <spec>] [--assets results,majors,<file>...]\n                                    download, verify and cache a release (default: results)\n  pin <spec>                        the user-local pin: what a bare open (spec \"pinned\") opens\n  unpin                             remove the pin (a bare open is then \"latest\")\n  current                           the pin, and whether it is cached\n  add <dir> --tag <tag>             add a release built locally (its MANIFEST.json and files)\n                                    to the cache under its tag\n  index [--release <spec>] [<name>...] [--force]\n                                    build the per-tag indexes (default: every one)\n  verify [--release <spec>]         re-hash every cached file against its receipt\n  capabilities [--release <spec>]   what the release carries of what the client reads, from\n                                    its own schema: each feature full or missing (its calls\n                                    refuse, naming the first cut that publishes it)\n  prune [--keep N] [--dry-run]      remove all but the N newest cached releases (default 1)\n                                    and the pinned one\n  rm <tag> [--dry-run]              remove one cached release (not the pinned one)\n  drop-indexes [<tag>] [--dry-run]  remove the index files (of one release, or of every one)\n  feis [--release <spec>] [--platform <p>] [--code <c>] [--id <id>] [--name <glob>] [--year <y>]\n                                    the feises a query names\n  series [--release <spec>] <name|host code|feis id>\n                                    the series a name, a host code (fweb:ABC) or any feis id\n                                    names: its years, hosts, codes and next instance\n  school [--release <spec>] <print|school_id> [--region <code>]\n                                    a school print or id to the published schools\n  dancer [--release <spec>] <name> | --surname <s> | --like <glob> | --id <dancer_id>\n         [--order surname-first|given-first] [--school <print|id>]\n         [--yob <y> | --band <U10> [--year <y>] | --comp <competition>] [--as-of <date>]\n         [--population girls|boys] [--rows]\n                                    the dancers a name reaches, each with its evidence\n                                    (name level, age, school, population) and the arm; the results of\n                                    the one dancer where one answers (or --rows for each)\n  results [--release <spec>] [--dancer <id>] [--feis <id>] [--comp <competition>]\n          [--school <print|id>] [--year <y>] [--limit <n>]\n                                    the published result rows, prints and ids\n  majors [--release <spec>] [--event <e>] [--year <y>] [--comp <competition>] [--dancer <id>]\n                                    the majors: every event and its years; an event's\n                                    competitions; a competition's, an event's or a dancer's rows\n  stream [--release <spec>] --scope majors|transcribed|platform|all [--entries] [--event <e,...>]\n         [--year <y> | --year <from>..<to>] [--tier <t,...>] [--category <c,...>]\n         [--level <feis_level,...>] [--dancer <id,...>] [--school <school_id>] [--primary]\n                                    every row a scope holds, one JSON line each, never the\n                                    whole table in memory; --entries one per address (the row\n                                    it stands for, with its recall order)\n  records [--release <spec>] [--dancer <id,...>]\n                                    every dancer's record: display, appearances, birth window,\n                                    populations\n  records --years [--release <spec>] [--dancer <id,...>] [--year <y>]\n                                    each dancer's region, nationals and place per year\n  feis-dates [--release <spec>]     every feis's first and last day\n  tabulated [--release <spec>] [--min-round <n>]\n                                    the majors addresses the marks sheets tabulate to round n\n                                    or later (default 3)\n  teams [--release <spec>] [--event <e>] [--year <y>] [--rosters | --joins]\n                                    the team result rows of an event-year; with --rosters its\n                                    roster teams and their dancers; with --joins how each roster\n                                    team meets the results\n  events [--release <spec>] [--event <e>] [--year <y>]\n                                    each event-year's dates and place\n  teacher [--release <spec>] <name|TD number>\n                                    the staff lists' people: where they taught, the register,\n                                    where they sat\n  adjudicator [--release <spec>] <name|TD number>\n                                    the register's and the panels' people: the same answer\n  comp [--release <spec>] <feis> <code> [--year <y>] [--title <t>]\n                                    a feis's own comp code to the comp it names, through that\n                                    feis's syllabus (or the prior year's)\n  syllabus [--release <spec>] <feis> [year]\n                                    one feis-year's comps, in printed order\n  syllabus [--release <spec>] --for <series> [year]\n                                    a series' syllabus for a year: that year's where held,\n                                    else the newest, saying which and what it is read from\n  resolve comp [<feis> <code>] [--year <y>] [--title <t>]\n  resolve dancer [<name>] [--school <s>] [--comp <feis>/<code> | --yob <y> | --band <b> --year <y>]\n                 [--order <o>] [--as-of <date>] [--population girls|boys]\n  resolve registrations\n                                    JSONL out, one answer per line; with no positional the\n                                    questions are JSONL on stdin, one per line (a comp:\n                                    {feis, code, year?, title?}, a dancer: {name, school?, age?,\n                                    population?}, a registration: {name, school?, codes[], feis,\n                                    year?, population?})\n\n  <spec>: pinned (the default) | latest | a cut (42, 42.1) | a tag (archive-YYYY.MM.DD-N)";
+export declare const USAGE = "usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json]\n\n  config repo <owner/name>          set the user-local repository the releases come from\n  list [--remote]                   the cached releases (size, files, indexes, the pin), and\n                                    with --remote the published tags\n  fetch [--release <spec>] [--assets results,majors,<file>...]\n                                    download, verify and cache a release (default: results)\n  pin <spec>                        the user-local pin: what a bare open (spec \"pinned\") opens\n  unpin                             remove the pin (a bare open is then \"latest\")\n  current                           the pin, and whether it is cached\n  add <dir> --tag <tag>             add a release built locally (its MANIFEST.json and files)\n                                    to the cache under its tag\n  index [--release <spec>] [<name>...] [--force]\n                                    build the per-tag indexes (default: every one)\n  verify [--release <spec>]         re-hash every cached file against its receipt\n  capabilities [--release <spec>]   what the release carries of what the client reads, from\n                                    its own schema: each feature full or missing (its calls\n                                    refuse, naming the first cut that publishes it)\n  prune [--keep N] [--dry-run]      remove all but the N newest cached releases (default 1)\n                                    and the pinned one\n  rm <tag> [--dry-run]              remove one cached release (not the pinned one)\n  drop-indexes [<tag>] [--dry-run]  remove the index files (of one release, or of every one)\n  feis [--release <spec>] [--platform <p>] [--code <c>] [--id <id>] [--name <glob>] [--year <y>]\n                                    the feises a query names\n  series [--release <spec>] <name|host code|feis id>\n                                    the series a name, a host code (fweb:ABC) or any feis id\n                                    names: its years, hosts, codes and next instance\n  school [--release <spec>] <print|school_id> [--region <code>]\n                                    a school print or id to the published schools\n  dancer [--release <spec>] <name> | --surname <s> | --like <glob> | --id <dancer_id>\n         [--order surname-first|given-first] [--school <print|id>]\n         [--yob <y> | --band <U10> [--year <y>] | --comp <competition>] [--as-of <date>]\n         [--population girls|boys] [--oireachtas <region>[:<year>]] [--rows]\n                                    the dancers a name reaches, each with its evidence\n                                    (name level, age, school, population, region) and the arm;\n                                    --oireachtas is the regional the roster is for, its region in\n                                    the release's spelling (SRO, MAO), its year the --as-of year\n                                    where none is given; the results of\n                                    the one dancer where one answers (or --rows for each)\n  results [--release <spec>] [--dancer <id>] [--feis <id>] [--comp <competition>]\n          [--school <print|id>] [--year <y>] [--limit <n>]\n                                    the published result rows, prints and ids\n  majors [--release <spec>] [--event <e>] [--year <y>] [--comp <competition>] [--dancer <id>]\n                                    the majors: every event and its years; an event's\n                                    competitions; a competition's, an event's or a dancer's rows\n  stream [--release <spec>] --scope majors|transcribed|platform|all [--entries] [--event <e,...>]\n         [--year <y> | --year <from>..<to>] [--tier <t,...>] [--category <c,...>]\n         [--level <feis_level,...>] [--dancer <id,...>] [--school <school_id>] [--primary]\n                                    every row a scope holds, one JSON line each, never the\n                                    whole table in memory; --entries one per address (the row\n                                    it stands for, with its recall order)\n  records [--release <spec>] [--dancer <id,...>]\n                                    every dancer's record: display, appearances, birth window,\n                                    populations\n  records --years [--release <spec>] [--dancer <id,...>] [--year <y>]\n                                    each dancer's region, nationals and place per year\n  feis-dates [--release <spec>]     every feis's first and last day\n  tabulated [--release <spec>] [--min-round <n>]\n                                    the majors addresses the marks sheets tabulate to round n\n                                    or later (default 3)\n  teams [--release <spec>] [--event <e>] [--year <y>] [--rosters | --joins]\n                                    the team result rows of an event-year; with --rosters its\n                                    roster teams and their dancers; with --joins how each roster\n                                    team meets the results\n  events [--release <spec>] [--event <e>] [--year <y>]\n                                    each event-year's dates and place\n  teacher [--release <spec>] <name|TD number>\n                                    the staff lists' people: where they taught, the register,\n                                    where they sat\n  adjudicator [--release <spec>] <name|TD number>\n                                    the register's and the panels' people: the same answer\n  comp [--release <spec>] <feis> <code> [--year <y>] [--title <t>]\n                                    a feis's own comp code to the comp it names, through that\n                                    feis's syllabus (or the prior year's)\n  syllabus [--release <spec>] <feis> [year]\n                                    one feis-year's comps, in printed order\n  syllabus [--release <spec>] --for <series> [year]\n                                    a series' syllabus for a year: that year's where held,\n                                    else the newest, saying which and what it is read from\n  resolve comp [<feis> <code>] [--year <y>] [--title <t>]\n  resolve dancer [<name>] [--school <s>] [--comp <feis>/<code> | --yob <y> | --band <b> --year <y>]\n                 [--order <o>] [--as-of <date>] [--population girls|boys]\n                 [--oireachtas <region>[:<year>]]\n  resolve registrations\n                                    JSONL out, one answer per line; with no positional the\n                                    questions are JSONL on stdin, one per line (a comp:\n                                    {feis, code, year?, title?}, a dancer: {name, school?, age?,\n                                    population?, oireachtas?}, a registration: {name, school?,\n                                    codes[], feis, year?, population?, oireachtas?})\n\n  <spec>: pinned (the default) | latest | a cut (42, 42.1) | a tag (archive-YYYY.MM.DD-N)";
 export interface Parsed {
     positional: string[];
     flags: Map<string, string>;

package/dist/types/dancers.d.ts

@@ -20,11 +20,17 @@ export interface DancerQuery {
     school?: string;
     age?: AgeAsked;
     asOf?: string;
+    oireachtas?: OireachtasAsked;
     population?: string;
 }
+export interface OireachtasAsked {
+    region: string;
+    year?: number;
+}
+export type RegionEvidence = "same" | "moved" | "contradicts" | "unknown" | "unasked";
 export type AgeEvidence = "fits" | "overlaps" | "contradicts" | "unknown" | "unasked";
 export type PopulationEvidence = "same" | "contradicts" | "both" | "unknown" | "unasked";
-export type SchoolEvidence = "same" | "moved" | "none" | "unresolved" | "unasked";
+export type SchoolEvidence = "same" | "lineage" | "moved" | "none" | "unresolved" | "unasked";
 export interface DancerSchool {
     school_id: string | null;
     print: string;
@@ -43,6 +49,7 @@ export interface DancerCandidate {
         age: AgeEvidence;
         school: SchoolEvidence;
         population: PopulationEvidence;
+        region: RegionEvidence;
     };
     prints: {
         print: string;
@@ -63,10 +70,17 @@ export interface DancerCandidate {
         boys: number;
     };
     school: DancerSchool | null;
+    region?: DancerRegion;
+}
+export interface DancerRegion {
+    year: number | null;
+    region: string | null;
+    regional: boolean;
+    attended: number;
 }
 export interface ExcludedCandidate {
     candidate: DancerCandidate;
-    why: "age" | "population";
+    why: "age" | "population" | "region";
 }
 export interface DancerAnswer {
     tag: string;
@@ -95,9 +109,16 @@ export interface DancerAnswer {
         read: "girls" | "boys" | null;
         note?: string;
     };
+    oireachtas?: {
+        asked: string;
+        read: string | null;
+        year: number;
+        note?: string;
+    };
     school?: {
         arm: string;
         ids: string[];
+        lineage?: string[];
     };
     refused?: string;
 }
@@ -163,7 +184,10 @@ export interface DancerYear {
 export declare class DancerResolver {
     private readonly rel;
     private readonly printIds;
+    private lineageOf;
+    private regions;
     constructor(rel: Release);
+    private lineage;
     records(q?: {
         ids?: readonly number[];
     }): Promise<{
@@ -182,6 +206,7 @@ export declare class DancerResolver {
     private capped;
     get(dancerId: number): Promise<DancerRecord | null>;
     private answer;
+    private readOireachtas;
     private schoolEvidence;
     private readAge;
 }

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 DancerSchool, type DancerSearchQuery, type DancerYear, type ExcludedCandidate, FEIS_LOCAL_ID_FLOOR, type PopulationEvidence, 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 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/presence.d.ts

@@ -0,0 +1,2 @@
+export declare function printsAbsence(print: string): boolean;
+export declare function notOnTheFloor(placePrinted: string | null, atts: string | null, withdrawn: string | null): boolean;

package/dist/types/registrations.d.ts

@@ -1,5 +1,5 @@
 import type { CompAnswer, CompResolver } from "./comps.js";
-import { type DancerAnswer, type DancerQuery } from "./dancers.js";
+import { type DancerAnswer, type DancerQuery, type OireachtasAsked } from "./dancers.js";
 import type { Release } from "./release.js";
 export interface RegistrationRow {
     name: string;
@@ -11,6 +11,7 @@ export interface RegistrationRow {
     titles?: Readonly<Record<string, string>>;
     asOf?: string;
     population?: string;
+    oireachtas?: OireachtasAsked;
     [k: string]: unknown;
 }
 export type DancerQueryLike = DancerQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.7.0",
+	"version": "0.9.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",