@finbheara/archive-client 0.6.0 → 0.8.0

package/README.md

@@ -20,7 +20,7 @@ type declarations (`.d.ts`), so a TypeScript project needs Bun's types (`"types"
 `bunx idq <verb>`.
 
 The version is 0.x while the API settles: a minor bump may break, so pin a minor
-(`"@finbheara/archive-client": "0.6.x"`).
+(`"@finbheara/archive-client": "0.7.x"`).
 
 ## Configuration
 
@@ -85,6 +85,7 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `staff` | `staff.teacher`, `staff.adjudicator` | 260 |
 | `majors.order` | `majors.competitions` | 260 |
 | `feises`, `comps` | `feises.find`, `feises.series`, `comps.*`, `registrations.resolve` | 265 |
+| `comps.dance` | the `dance` a comp of `comps.*` carries: null, never refused, without it | 270 |
 | `results.stream`, `majors.stream` | `results.stream`, `results.entries` | 255 |
 | `feises.dates` | `feises.dates` | 245 |
 | `dancers.records` | `dancers.records` | 215 |
@@ -233,7 +234,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
@@ -250,12 +261,13 @@ 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.
 
 A FEIS-LOCAL ID (`FEIS_LOCAL_ID_FLOOR`, 2^34, and up) is valid in its release only: a candidate and a result row
@@ -388,6 +400,8 @@ c.level;      // "OC" (FF, BG, AB, NV, PW, PC, OC), c.feis_level 700
 c.age;        // "U10", c.population "mixed", c.canonical "710OC", c.title, c.competition
 c.age_source; // "printed" | "title" | "code" | "merged" | null, c.age_printed "U10" as printed
 c.second;     // true for a second chance or a supplementary comp beside the main one
+c.dance;      // "reel", "light-jig", "single-jig", "slip-jig", "treble-jig", "hornpipe",
+              // "treble-reel", "traditional-set", "set-dance", or null where the release names none
 c.from;       // { feis_ids: ["fweb:ABC25"], year: 2025 } where an earlier year answered
 c.check;      // "unchecked", or what the caller's `title` says about the earlier comp
 c.syllabus_source;  // "results": what the syllabus the answer read is read from
@@ -430,6 +444,10 @@ QuickFeis numbers its own and-over championships (`15 & over` prelim `616PC`, `1
 `719OC`). An and-over code is then the same string as an `Under N + 1` one, and `age` (`O18`)
 tells them apart. An adult band, a range and a grade render none.
 
+`dance` is the release's own `competitions.dance`, read there off the platform's dance field, its
+level field and the title, in that order: one dance or none, never a word read here. A release
+older than the column answers null for every comp, and `rel.capability("comps.dance")` says which.
+
 `age` is the release's reading, and `age_source` says where it was read. A `merged` comp (a
 platform's comps merged into one, `710OCM` with no `710OC` beside it) prints one member's band,
 so its `age` is the union of its members' (`U12` for `710OCM - U10 Open Champion` where the next

package/dist/chunks/{index-gy5xye67.js → index-mg6dw0y5.js}

@@ -106,6 +106,215 @@ 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 ENTRY_RANK = new Map([
   ["final", 0],
   ["", 1],
@@ -375,6 +584,7 @@ class MajorsFinder2 {
   }
 }
 
+var LINEAGE_FILE = "school-lineage.jsonl";
 function nameOrderOf(s) {
   return s === "surname-first" || s === "given-first" || s === "unknown" ? s : undefined;
 }
@@ -506,11 +716,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,
@@ -520,6 +736,7 @@ var POPULATION_WEIGHT = {
 };
 var SCHOOL_WEIGHT = {
   same: 2,
+  lineage: 2,
   moved: 1,
   none: 0,
   unresolved: 0,
@@ -535,9 +752,30 @@ function idChunks(ids) {
 class DancerResolver2 {
   rel;
   printIds = new Map;
+  lineageOf;
   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");
@@ -643,11 +881,27 @@ class DancerResolver2 {
     const age = q.age === undefined ? undefined : this.readAge(q.age, asOf);
     const population = q.population === undefined ? undefined : readPopulation2(q.population);
     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,7 +928,7 @@ 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);
       all.push({
         dancer_id: id,
         display: d.display,
@@ -706,15 +960,17 @@ class DancerResolver2 {
       });
     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;
       }
     return {
@@ -730,29 +986,33 @@ class DancerResolver2 {
       ...school !== undefined ? { school } : {}
     };
   }
-  async schoolEvidence(schools, ids, asOf) {
+  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) => {
@@ -865,16 +1125,16 @@ 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,
   feis_level INTEGER, round TEXT, platform TEXT NOT NULL, captures INTEGER NOT NULL,
   file TEXT NOT NULL, line INTEGER NOT NULL, age_source TEXT, age_printed TEXT,
-  gender_source TEXT, level_printed TEXT, dance_printed TEXT
+  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)"
 ];
@@ -883,16 +1143,17 @@ var OPTIONAL = [
   "age_printed",
   "gender_source",
   "level_printed",
-  "dance_printed"
+  "dance_printed",
+  "dance"
 ];
 var fold = (code) => code.trim().toLowerCase();
 var compsIndex = {
   name: "comps",
-  version: "2",
+  version: "3",
   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())
@@ -901,14 +1162,14 @@ var compsIndex = {
     const captures = new Map;
     for (const r of src.query("SELECT competition, count(*) AS n FROM competitions GROUP BY competition").all())
       captures.set(r.competition, r.n);
-    const put = out.prepare("INSERT OR IGNORE INTO comp VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    const put = out.prepare("INSERT OR IGNORE INTO comp VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     const has = new Set(src.query("PRAGMA table_info(competitions)").all().map((r) => r.name));
     const opt = (col) => has.has(col) ? col : `NULL AS ${col}`;
     for (const c of src.query(`SELECT competition, event, year, comp_no, title, age, gender, feis_level, round, source, file, line, ${OPTIONAL.map(opt).join(", ")} FROM competitions WHERE comp_no IS NOT NULL AND trim(comp_no) != '' ORDER BY file, line`).iterate()) {
       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);
+      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);
   }
 };
@@ -933,6 +1194,7 @@ function compOf(r, codes = []) {
     age_printed: r.age_printed ?? null,
     population: pop === "" ? null : pop,
     second,
+    dance: r.dance ?? null,
     round,
     canonical: canonicalOf2(lv, r.age),
     platform: r.platform,
@@ -1197,215 +1459,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";
@@ -2509,6 +2562,18 @@ var FEATURES2 = [
     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: [
@@ -3221,4 +3286,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-gy5xye67.js";
+} from "./chunks/index-mg6dw0y5.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 
@@ -178,7 +178,7 @@ 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})` : ""}`);
   for (const c of a.candidates)

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-gy5xye67.js";
+} from "./chunks/index-mg6dw0y5.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/comps.d.ts

@@ -2,6 +2,7 @@ import { type AgeRelation } from "@finbheara/domain/age";
 import { type Population, type PopulationRelation } from "@finbheara/domain/title";
 import type { IndexBuilder } from "./indexes.js";
 import type { Release } from "./release.js";
+export type CompDance = "reel" | "light-jig" | "single-jig" | "slip-jig" | "treble-jig" | "hornpipe" | "treble-reel" | "traditional-set" | "set-dance";
 export type CompKind = "championship" | "grade" | "unrated";
 export type CompSource = "syllabus" | "prior-year" | "title";
 export type SyllabusSource = "syllabus-document" | "results";
@@ -19,6 +20,7 @@ export interface Comp {
     age_printed: string | null;
     population: Population | null;
     second: boolean;
+    dance: CompDance | null;
     round: string | null;
     canonical: string | null;
     platform: string;
@@ -115,6 +117,7 @@ interface CompRow {
     gender_source?: string | null;
     level_printed?: string | null;
     dance_printed?: string | null;
+    dance?: string | null;
 }
 export declare function compOf(r: CompRow, codes?: readonly string[]): Comp;
 export declare function canonicalOf(level: number | null, age: string | null): string | null;

package/dist/types/dancers.d.ts

@@ -24,7 +24,7 @@ export interface DancerQuery {
 }
 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;
@@ -98,6 +98,7 @@ export interface DancerAnswer {
     school?: {
         arm: string;
         ids: string[];
+        lineage?: string[];
     };
     refused?: string;
 }
@@ -163,7 +164,9 @@ export interface DancerYear {
 export declare class DancerResolver {
     private readonly rel;
     private readonly printIds;
+    private lineageOf;
     constructor(rel: Release);
+    private lineage;
     records(q?: {
         ids?: readonly number[];
     }): Promise<{

package/dist/types/index.d.ts

@@ -2,7 +2,7 @@ export { type AssetPlan, DATABASES, type DatabaseName, type LandedFile, type Rec
 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 { NAME_LEVELS, type NameLevel, nameLevel } from "./dancers-names.js";
-export { type Comp, type CompAnswer, type CompKind, type CompQuery, CompResolver, type CompSource, type FeisPlace, type SyllabusAnswer, type SyllabusForAnswer, type SyllabusSource, type TitleCheck, canonicalOf, } from "./comps.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";
 export { type Feis, type FeisAnswer, FeisFinder, type FeisQuery, NO_CALENDAR, type Series, type SeriesAnswer, type SeriesInstance, type SeriesNext, } from "./feises.js";
 export { type IndexBuilder, type IndexFile, buildIndex, defaultBuilders, ensureIndex, indexKey, indexPath, isCurrent, listIndexes, } from "./indexes.js";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.6.0",
+	"version": "0.8.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",
@@ -44,8 +44,8 @@
 		"prepublishOnly": "bun scripts/build.ts && bun ../../tools/checks/archive-client-tarball.ts"
 	},
 	"dependencies": {
-		"@finbheara/domain": "0.49.0",
-		"@finbheara/names": "0.22.0",
+		"@finbheara/domain": "0.50.0",
+		"@finbheara/names": "0.23.0",
 		"hyparquet": "1.31.2"
 	},
 	"devDependencies": {