@finbheara/archive-client 0.14.0 → 0.15.0

package/README.md

@@ -238,12 +238,26 @@ NO NEW MATCHER. A print is read in the dancer's role by `@finbheara/domain` over
 `@finbheara/names`, and a candidate's `nameLevel` is the finest of: `nn0` to `nn4` (equal at that
 level of the names package: the print, the key, the folded key, the tokens in any order),
 `initial` (one surname, one given name the other's made poorer: `givenAbbreviates`), `middle`
-(a middle name one print omits: `nameRelation`). `age` is how the dancer's published birth window
+(a middle name one print omits: `nameRelation`), `given-middle` (one surname, and the first given
+name one print uses is a later given name of the other's, `Grace Zumock` of `Ailbhe Grace Zumock`:
+asked only where no finer level found anyone), `spanish` (see below). `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`),
 `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).
 
+A SPANISH NAME, AT A SITE THAT CARRIES `spanishNames`. A register prints the full form, given
+names and a paternal and a maternal surname (`Ana Inés Varrondo Quelmar`), and a results sheet
+often prints one given name and the paternal surname alone (`Inés Varrondo`). A school file, or a
+branch of one, is flagged `spanishNames: true` in the store, and the release's
+`school-registry.jsonl` line carries it as `spanish_names: { file, prints }` (the file's own flag,
+and the prints of its flagged branches). Where the name as asked finds no one and the asked school
+reads that way (`readsSpanishNames(candidates)`: a flagged file, or a print that reached it is one
+of its flagged branches' prints), every print of every dancer at that school is asked under the
+names package's Spanish reading (`createNameKinship({ spanishNames: true })`), and a print it
+relates is a candidate at `nameLevel: "spanish"`. A release with no `spanish_names` reads every
+school the default way. A name the release already finds answers exactly as before.
+
 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

package/dist/chunks/{index-hhhrh1db.js → index-9r4rw6xq.js}

@@ -68,7 +68,7 @@ function sha256OfDigest(digest) {
 }
 
 import { Age, DANCE_UP_YEARS, birthYearsMeet } from "@finbheara/domain/age";
-import { createIndex, indexSchema, personEncoder } from "@finbheara/domain/noun-index";
+import { createIndex as createIndex2, indexSchema as indexSchema2, personEncoder } from "@finbheara/domain/noun-index";
 import domainPkg from "@finbheara/domain/package.json";
 import { dancerName } from "@finbheara/domain/person";
 import {
@@ -80,20 +80,25 @@ import {
   composeNames,
   foldNameKey,
   nameBlockKeys,
-  nameKinship,
+  nameKinship as nameKinship2,
   surnameBlock
 } from "@finbheara/names/normalize";
 import namesPkg from "@finbheara/names/package.json";
 
 import {
+  KINSHIP_VIAS,
   NAME_LEVEL_COLUMNS,
+  createNameKinship,
   givenAbbreviates,
+  nameKinship,
   nameRelation
 } from "@finbheara/names/normalize";
 var NAME_LEVELS2 = [
   ...NAME_LEVEL_COLUMNS,
   "initial",
   "middle",
+  "given-middle",
+  "spanish",
   "form",
   "surname",
   "like"
@@ -113,6 +118,17 @@ function nameLevel2(q, c) {
     return "middle";
   return null;
 }
+function givenMiddleLevel(q, c) {
+  if (!q.isPerson() || !c.isPerson())
+    return null;
+  const k = nameKinship(q, c);
+  return k.relation !== "different" && k.via.includes("given-middle") && k.via.every((v) => v === "given-middle" || KINSHIP_VIAS[v].gateSafe) ? "given-middle" : null;
+}
+var spanish = createNameKinship({ spanishNames: true });
+function spanishLevel(q, c) {
+  const k = spanish(q, c);
+  return k.relation !== "different" && k.via.includes("spanish") ? "spanish" : null;
+}
 
 import { readFileSync } from "fs";
 var SCHEMA = `
@@ -616,6 +632,189 @@ class MajorsFinder2 {
   }
 }
 
+import { createIndex, indexSchema } from "@finbheara/domain/noun-index";
+import {
+  DEFAULT_SCHOOL_NAME_READER,
+  schoolEncoder
+} from "@finbheara/domain/school";
+function readsSpanishNames2(candidates) {
+  return candidates.some((c) => c.spanishNames !== undefined && (c.spanishNames.file || c.prints.some((p) => c.spanishNames?.prints.includes(p.trim()))));
+}
+var GENERIC_SCHOOL_READER = {
+  id: "generic",
+  reader: DEFAULT_SCHOOL_NAME_READER
+};
+var encoderOf = (r) => schoolEncoder({ reader: r.reader });
+var TABLE = "school_name";
+var schoolsIndex = {
+  name: "schools",
+  version: "3",
+  inputs: ["results", "school-registry.jsonl", "school-redirects.jsonl"],
+  says: "every published school print and its ids, read at the school reader's slots",
+  keyParts: (rel) => [`reader=${rel.schoolReader().id}`],
+  build(rel, out) {
+    const choice = rel.schoolReader();
+    const encoder = encoderOf(choice);
+    out.run("CREATE TABLE print_id(print TEXT NOT NULL, school_id TEXT NOT NULL, rows INTEGER NOT NULL, year_lo INTEGER, year_hi INTEGER, PRIMARY KEY(print, school_id)) WITHOUT ROWID");
+    out.run("CREATE TABLE registry(school_id TEXT PRIMARY KEY, display TEXT NOT NULL, regions TEXT NOT NULL, places TEXT NOT NULL, spanish TEXT)");
+    out.run("CREATE TABLE redirect(old_id TEXT PRIMARY KEY, new_id TEXT NOT NULL, kind TEXT NOT NULL)");
+    const schema = indexSchema(encoder, { table: TABLE });
+    out.run(schema.table);
+    const src = rel.db("results");
+    const lined = src.query("PRAGMA table_info(results)").all().some((c) => c.name === "competition_line");
+    const pairs = src.query(lined ? `SELECT trim(r.school_printed) AS p, r.school_id AS s, count(*) AS n,
+				        min(c.year) AS lo, max(c.year) AS hi
+				 FROM results r LEFT JOIN competitions c ON c.file = r.file AND c.line = r.competition_line
+				 WHERE r.school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2` : `SELECT trim(school_printed) AS p, school_id AS s, count(*) AS n, NULL AS lo, NULL AS hi
+				 FROM results WHERE school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2`).all();
+    const putPair = out.prepare("INSERT INTO print_id VALUES (?, ?, ?, ?, ?)");
+    for (const r of pairs)
+      putPair.run(r.p, r.s, r.n, r.lo, r.hi);
+    out.run("CREATE INDEX print_id_school ON print_id(school_id)");
+    const names = createIndex(out, encoder, {
+      table: TABLE
+    });
+    let last = null;
+    for (const r of pairs) {
+      if (r.p === last)
+        continue;
+      last = r.p;
+      names.add(choice.reader.schoolName(r.p), r.p);
+    }
+    for (const s of schema.indexes)
+      out.run(s);
+    const putReg = out.prepare("INSERT OR REPLACE INTO registry VALUES (?, ?, ?, ?, ?)");
+    for (const r of readJsonl(rel.path("school-registry.jsonl")))
+      putReg.run(r.school_id, r.display, JSON.stringify([...new Set(r.regions.map((x) => x.region))]), JSON.stringify([...new Set(r.locations.map((x) => x.place))]), r.spanish_names === undefined ? null : JSON.stringify({
+        file: r.spanish_names.file === true,
+        prints: [...new Set(r.spanish_names.prints.map((p) => p.trim()))].sort()
+      }));
+    const putRed = out.prepare("INSERT OR REPLACE INTO redirect VALUES (?, ?, ?)");
+    for (const r of readJsonl(rel.path("school-redirects.jsonl")))
+      putRed.run(r.old_id, r.new_id, r.kind);
+  }
+};
+
+class SchoolResolver2 {
+  rel;
+  constructor(rel) {
+    this.rel = rel;
+  }
+  async resolve(asked, q = {}) {
+    const db = await this.rel.indexDb("schools");
+    const reg = db.query("SELECT display, regions, places, spanish FROM registry WHERE school_id = ?");
+    const candidate = (id, by, rows, prints) => {
+      const r = reg.get(id);
+      return {
+        school_id: id,
+        display: r?.display ?? null,
+        rows,
+        by,
+        prints,
+        regions: r === null ? [] : JSON.parse(r.regions),
+        places: r === null ? [] : JSON.parse(r.places),
+        ...r?.spanish == null ? {} : { spanishNames: JSON.parse(r.spanish) }
+      };
+    };
+    const answer = (candidates, extra = {}) => {
+      let cs = candidates.sort((a, b) => b.rows - a.rows || (a.school_id < b.school_id ? -1 : 1));
+      let year;
+      if (q.year !== undefined && cs.length > 1 && cs.every((c) => c.years !== undefined)) {
+        const y = q.year;
+        const span = (c) => c.years;
+        let kept = cs.filter((c) => {
+          const { lo, hi } = span(c);
+          return lo !== null && hi !== null && lo <= y && y <= hi;
+        });
+        if (kept.length === 0) {
+          const before = cs.filter((c) => span(c).hi !== null && span(c).hi < y);
+          const last = Math.max(...before.map((c) => span(c).hi));
+          kept = before.filter((c) => span(c).hi === last);
+        }
+        year = { asked: y, narrowed: kept.length > 0 && kept.length < cs.length };
+        if (kept.length > 0)
+          cs = kept;
+      }
+      let region;
+      if (q.region !== undefined) {
+        const kept = cs.filter((c) => c.regions.length === 0 || c.regions.includes(q.region));
+        region = { asked: q.region, narrowed: kept.length > 0 && kept.length < cs.length };
+        if (kept.length > 0)
+          cs = kept;
+      }
+      return {
+        tag: this.rel.tag,
+        asked,
+        arm: cs.length === 0 ? "none" : cs.length === 1 ? "unique" : "ambiguous",
+        candidates: cs,
+        ...region !== undefined ? { region } : {},
+        ...year !== undefined ? { year } : {},
+        ...extra
+      };
+    };
+    const byId = (id, by) => {
+      const rs = db.query("SELECT print, rows FROM print_id WHERE school_id = ? ORDER BY print").all(id);
+      return candidate(id, by, rs.reduce((n, r) => n + r.rows, 0), rs.map((r) => r.print));
+    };
+    const a = asked.trim();
+    if (reg.get(a) !== null)
+      return answer([byId(a, "id")]);
+    let live = a;
+    const seen = new Set;
+    for (;; ) {
+      const r = db.query("SELECT new_id FROM redirect WHERE old_id = ?").get(live);
+      if (r === null || seen.has(r.new_id))
+        break;
+      seen.add(live);
+      live = r.new_id;
+    }
+    if (live !== a)
+      return answer([byId(live, "redirect")], { redirected: { from: a, to: live } });
+    const byPrints = (prints, by) => {
+      const ids = new Map;
+      const q2 = db.query("SELECT school_id, rows, year_lo AS lo, year_hi AS hi FROM print_id WHERE print = ?");
+      for (const p of prints)
+        for (const r of q2.all(p)) {
+          const e = ids.get(r.school_id) ?? {
+            rows: 0,
+            prints: new Set,
+            lo: null,
+            hi: null
+          };
+          e.rows += r.rows;
+          e.prints.add(p);
+          if (r.lo !== null && (e.lo === null || r.lo < e.lo))
+            e.lo = r.lo;
+          if (r.hi !== null && (e.hi === null || r.hi > e.hi))
+            e.hi = r.hi;
+          ids.set(r.school_id, e);
+        }
+      return [...ids].map(([id, e]) => ({
+        ...candidate(id, by, e.rows, [...e.prints].sort()),
+        years: { lo: e.lo, hi: e.hi }
+      }));
+    };
+    const exact = byPrints([a], "print");
+    if (exact.length > 0)
+      return answer(exact);
+    const choice = this.rel.schoolReader();
+    const read = choice.reader.schoolName(a);
+    if (!read.isSchool())
+      return answer([], {
+        refused: read.refusal?.reason ?? (read.isEmpty() ? "empty" : "not a school")
+      });
+    const names = createIndex(db, encoderOf(choice), {
+      table: TABLE
+    });
+    for (const level of ["sn3", "realWords"]) {
+      const prints = names.get(read, level);
+      if (prints.length > 0)
+        return answer(byPrints(prints, level));
+    }
+    return answer([]);
+  }
+}
+
 var LINEAGE_FILE = "school-lineage.jsonl";
 function schoolLine(lineage, ids, year) {
   const reached = new Set(ids);
@@ -649,7 +848,7 @@ var dancersIndex = {
   keyParts: () => [...PACKAGE_KEY_PARTS],
   says: "every published dancer print at the names package's keys, its dancers, schools and years",
   build(rel, out) {
-    const schema = indexSchema(ENCODER, PERSON);
+    const schema = indexSchema2(ENCODER, PERSON);
     out.run(schema.table);
     out.run("CREATE TABLE print_dancer(person INTEGER NOT NULL, dancer_id INTEGER, rows INTEGER NOT NULL, year_lo INTEGER, year_hi INTEGER)");
     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)");
@@ -664,7 +863,7 @@ var dancersIndex = {
 				        count(*) AS n, min(c.year) AS lo, max(c.year) AS hi
 				 FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line
 				 GROUP BY 1, 2, 3, 4, 5 ORDER BY 1, 2, 3, 4, 5`).all();
-    const names = createIndex(out, ENCODER, PERSON);
+    const names = createIndex2(out, ENCODER, PERSON);
     const personOf = new Map;
     let next = 0;
     const idOf = (p, o) => {
@@ -776,6 +975,8 @@ var NAME_WEIGHT = {
   nn4: 3,
   initial: 2,
   middle: 1.5,
+  "given-middle": 1.25,
+  spanish: 1.25,
   form: 1.25,
   surname: 1,
   like: 1
@@ -909,14 +1110,22 @@ class DancerResolver2 {
         unlinked: [],
         refused: asked.printsNoName() ? "the print names no person" : "the print reads as no person (a bare word is a surname: search it)"
       };
-    const names = createIndex(db, ENCODER, PERSON);
+    const names = createIndex2(db, ENCODER, PERSON);
     const hits = new Map;
+    const middleUsed = new Map;
     for (const { value, row } of names.rows({ surname_key: [asked.surnameKey()], nn4: [asked.nn4] }, ["print", "reading"])) {
       const c = ENCODER.decode(row);
       const level = nameLevel2(asked, c);
       if (level !== null)
         hits.set(value, level);
-    }
+      else if (givenMiddleLevel(asked, c) !== null)
+        middleUsed.set(value, "given-middle");
+    }
+    if (hits.size === 0)
+      for (const [k, v] of middleUsed)
+        hits.set(k, v);
+    if (hits.size === 0 && q.school !== undefined)
+      await this.spanishHits(db, asked, q.school, hits);
     const exact = await this.answer(db, q, hits);
     if (exact.arm !== "none")
       return exact;
@@ -962,12 +1171,29 @@ class DancerResolver2 {
         out.set(id, [...composed.via]);
         continue;
       }
-      const kin = nameKinship(asked, c);
+      const kin = nameKinship2(asked, c);
       if (kin.relation !== "different")
         out.set(id, [...kin.via]);
     }
     return out;
   }
+  async spanishHits(db, asked, school, hits) {
+    const s = await this.rel.schools.resolve(school);
+    if (s.candidates.length === 0)
+      return;
+    if (!readsSpanishNames2(s.candidates))
+      return;
+    const ids = s.candidates.map((c) => c.school_id);
+    const persons = db.query(`SELECT DISTINCT p.id AS id, p.print AS print, p.reading AS reading
+				 FROM dancer_school s JOIN print_dancer x ON x.dancer_id = s.dancer_id
+				 JOIN person p ON p.id = x.person
+				 WHERE s.school_id IN (${ids.map(() => "?").join(",")}) ORDER BY p.id`).all(...ids);
+    for (const r of persons) {
+      const c = ENCODER.decode(r);
+      if (spanishLevel(asked, c) !== null)
+        hits.set(r.id, "spanish");
+    }
+  }
   async search(q) {
     if (q.name !== undefined) {
       const a = await this.resolve({ ...q, name: q.name });
@@ -975,7 +1201,7 @@ class DancerResolver2 {
     }
     const db = await this.rel.indexDb("dancers");
     const hits = new Map;
-    const names = createIndex(db, ENCODER, PERSON);
+    const names = createIndex2(db, ENCODER, PERSON);
     if (q.surname !== undefined) {
       const block = surnameBlock(foldNameKey(q.surname).toUpperCase());
       if (block !== null)
@@ -1399,7 +1625,7 @@ function otherGiven(db, dancerId, asked) {
       continue;
     if (nameLevel2(asked, p) !== null)
       continue;
-    if (nameKinship(asked, p).relation !== "different")
+    if (nameKinship2(asked, p).relation !== "different")
       continue;
     return `printed "${print}", another given name than the asked one, and met it only through an initial`;
   }
@@ -1875,8 +2101,8 @@ import { existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync } from
 import { join } from "path";
 
 import {
-  createIndex as createIndex2,
-  indexSchema as indexSchema2,
+  createIndex as createIndex3,
+  indexSchema as indexSchema3,
   roleEncoder
 } from "@finbheara/domain/noun-index";
 import { roleName } from "@finbheara/domain/person";
@@ -1910,10 +2136,10 @@ var staffIndex = {
   keyParts: () => [...PACKAGE_KEY_PARTS],
   says: "teachers and adjudicators by name and TD number: the schools they taught at, the register, the seats they sat",
   build(rel, out) {
-    const schema = indexSchema2(ENCODER2, WHO);
+    const schema = indexSchema3(ENCODER2, WHO);
     out.run(schema.table);
     out.run(SCHEMA3);
-    const who = createIndex2(out, ENCODER2, WHO);
+    const who = createIndex3(out, ENCODER2, WHO);
     const putEntry = out.prepare("INSERT INTO entry VALUES (?, ?, ?, ?, ?)");
     let next = 0;
     const add = (role, print, clrg, judgeId, schools, source) => {
@@ -2012,7 +2238,7 @@ class StaffFinder2 {
       if (!q.isPerson())
         refused = "the print reads as no person";
       else {
-        const who = createIndex2(db, ENCODER2, WHO);
+        const who = createIndex3(db, ENCODER2, WHO);
         for (const { value, row } of who.rows({ surname_key: [q.surnameKey()], nn4: [q.nn4] })) {
           const p = ENCODER2.decode(row);
           if (p.role !== role)
@@ -2109,182 +2335,6 @@ class StaffFinder2 {
   }
 }
 
-import { createIndex as createIndex3, indexSchema as indexSchema3 } from "@finbheara/domain/noun-index";
-import {
-  DEFAULT_SCHOOL_NAME_READER,
-  schoolEncoder
-} from "@finbheara/domain/school";
-var GENERIC_SCHOOL_READER = {
-  id: "generic",
-  reader: DEFAULT_SCHOOL_NAME_READER
-};
-var encoderOf = (r) => schoolEncoder({ reader: r.reader });
-var TABLE = "school_name";
-var schoolsIndex = {
-  name: "schools",
-  version: "3",
-  inputs: ["results", "school-registry.jsonl", "school-redirects.jsonl"],
-  says: "every published school print and its ids, read at the school reader's slots",
-  keyParts: (rel) => [`reader=${rel.schoolReader().id}`],
-  build(rel, out) {
-    const choice = rel.schoolReader();
-    const encoder = encoderOf(choice);
-    out.run("CREATE TABLE print_id(print TEXT NOT NULL, school_id TEXT NOT NULL, rows INTEGER NOT NULL, year_lo INTEGER, year_hi INTEGER, PRIMARY KEY(print, school_id)) WITHOUT ROWID");
-    out.run("CREATE TABLE registry(school_id TEXT PRIMARY KEY, display TEXT NOT NULL, regions TEXT NOT NULL, places TEXT NOT NULL)");
-    out.run("CREATE TABLE redirect(old_id TEXT PRIMARY KEY, new_id TEXT NOT NULL, kind TEXT NOT NULL)");
-    const schema = indexSchema3(encoder, { table: TABLE });
-    out.run(schema.table);
-    const src = rel.db("results");
-    const lined = src.query("PRAGMA table_info(results)").all().some((c) => c.name === "competition_line");
-    const pairs = src.query(lined ? `SELECT trim(r.school_printed) AS p, r.school_id AS s, count(*) AS n,
-				        min(c.year) AS lo, max(c.year) AS hi
-				 FROM results r LEFT JOIN competitions c ON c.file = r.file AND c.line = r.competition_line
-				 WHERE r.school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2` : `SELECT trim(school_printed) AS p, school_id AS s, count(*) AS n, NULL AS lo, NULL AS hi
-				 FROM results WHERE school_id IS NOT NULL GROUP BY 1, 2 ORDER BY 1, 2`).all();
-    const putPair = out.prepare("INSERT INTO print_id VALUES (?, ?, ?, ?, ?)");
-    for (const r of pairs)
-      putPair.run(r.p, r.s, r.n, r.lo, r.hi);
-    out.run("CREATE INDEX print_id_school ON print_id(school_id)");
-    const names = createIndex3(out, encoder, {
-      table: TABLE
-    });
-    let last = null;
-    for (const r of pairs) {
-      if (r.p === last)
-        continue;
-      last = r.p;
-      names.add(choice.reader.schoolName(r.p), r.p);
-    }
-    for (const s of schema.indexes)
-      out.run(s);
-    const putReg = out.prepare("INSERT OR REPLACE INTO registry VALUES (?, ?, ?, ?)");
-    for (const r of readJsonl(rel.path("school-registry.jsonl")))
-      putReg.run(r.school_id, r.display, JSON.stringify([...new Set(r.regions.map((x) => x.region))]), JSON.stringify([...new Set(r.locations.map((x) => x.place))]));
-    const putRed = out.prepare("INSERT OR REPLACE INTO redirect VALUES (?, ?, ?)");
-    for (const r of readJsonl(rel.path("school-redirects.jsonl")))
-      putRed.run(r.old_id, r.new_id, r.kind);
-  }
-};
-
-class SchoolResolver2 {
-  rel;
-  constructor(rel) {
-    this.rel = rel;
-  }
-  async resolve(asked, q = {}) {
-    const db = await this.rel.indexDb("schools");
-    const reg = db.query("SELECT display, regions, places FROM registry WHERE school_id = ?");
-    const candidate = (id, by, rows, prints) => {
-      const r = reg.get(id);
-      return {
-        school_id: id,
-        display: r?.display ?? null,
-        rows,
-        by,
-        prints,
-        regions: r === null ? [] : JSON.parse(r.regions),
-        places: r === null ? [] : JSON.parse(r.places)
-      };
-    };
-    const answer = (candidates, extra = {}) => {
-      let cs = candidates.sort((a, b) => b.rows - a.rows || (a.school_id < b.school_id ? -1 : 1));
-      let year;
-      if (q.year !== undefined && cs.length > 1 && cs.every((c) => c.years !== undefined)) {
-        const y = q.year;
-        const span = (c) => c.years;
-        let kept = cs.filter((c) => {
-          const { lo, hi } = span(c);
-          return lo !== null && hi !== null && lo <= y && y <= hi;
-        });
-        if (kept.length === 0) {
-          const before = cs.filter((c) => span(c).hi !== null && span(c).hi < y);
-          const last = Math.max(...before.map((c) => span(c).hi));
-          kept = before.filter((c) => span(c).hi === last);
-        }
-        year = { asked: y, narrowed: kept.length > 0 && kept.length < cs.length };
-        if (kept.length > 0)
-          cs = kept;
-      }
-      let region;
-      if (q.region !== undefined) {
-        const kept = cs.filter((c) => c.regions.length === 0 || c.regions.includes(q.region));
-        region = { asked: q.region, narrowed: kept.length > 0 && kept.length < cs.length };
-        if (kept.length > 0)
-          cs = kept;
-      }
-      return {
-        tag: this.rel.tag,
-        asked,
-        arm: cs.length === 0 ? "none" : cs.length === 1 ? "unique" : "ambiguous",
-        candidates: cs,
-        ...region !== undefined ? { region } : {},
-        ...year !== undefined ? { year } : {},
-        ...extra
-      };
-    };
-    const byId = (id, by) => {
-      const rs = db.query("SELECT print, rows FROM print_id WHERE school_id = ? ORDER BY print").all(id);
-      return candidate(id, by, rs.reduce((n, r) => n + r.rows, 0), rs.map((r) => r.print));
-    };
-    const a = asked.trim();
-    if (reg.get(a) !== null)
-      return answer([byId(a, "id")]);
-    let live = a;
-    const seen = new Set;
-    for (;; ) {
-      const r = db.query("SELECT new_id FROM redirect WHERE old_id = ?").get(live);
-      if (r === null || seen.has(r.new_id))
-        break;
-      seen.add(live);
-      live = r.new_id;
-    }
-    if (live !== a)
-      return answer([byId(live, "redirect")], { redirected: { from: a, to: live } });
-    const byPrints = (prints, by) => {
-      const ids = new Map;
-      const q2 = db.query("SELECT school_id, rows, year_lo AS lo, year_hi AS hi FROM print_id WHERE print = ?");
-      for (const p of prints)
-        for (const r of q2.all(p)) {
-          const e = ids.get(r.school_id) ?? {
-            rows: 0,
-            prints: new Set,
-            lo: null,
-            hi: null
-          };
-          e.rows += r.rows;
-          e.prints.add(p);
-          if (r.lo !== null && (e.lo === null || r.lo < e.lo))
-            e.lo = r.lo;
-          if (r.hi !== null && (e.hi === null || r.hi > e.hi))
-            e.hi = r.hi;
-          ids.set(r.school_id, e);
-        }
-      return [...ids].map(([id, e]) => ({
-        ...candidate(id, by, e.rows, [...e.prints].sort()),
-        years: { lo: e.lo, hi: e.hi }
-      }));
-    };
-    const exact = byPrints([a], "print");
-    if (exact.length > 0)
-      return answer(exact);
-    const choice = this.rel.schoolReader();
-    const read = choice.reader.schoolName(a);
-    if (!read.isSchool())
-      return answer([], {
-        refused: read.refusal?.reason ?? (read.isEmpty() ? "empty" : "not a school")
-      });
-    const names = createIndex3(db, encoderOf(choice), {
-      table: TABLE
-    });
-    for (const level of ["sn3", "realWords"]) {
-      const prints = names.get(read, level);
-      if (prints.length > 0)
-        return answer(byPrints(prints, level));
-    }
-    return answer([]);
-  }
-}
-
 import { parquetMetadata, parquetReadObjects, parquetSchema } from "hyparquet";
 var COMPRESSORS = {
   ZSTD: (input) => new Uint8Array(Bun.zstdDecompressSync(input))
@@ -3733,4 +3783,4 @@ function releases2(opts = {}) {
   return new ReleaseManager2(opts);
 }
 
-export { DATABASES2, planAsset2, sha256File2, unzstdTo2, NAME_LEVELS2, nameLevel2, NO_CALENDAR2, FeisFinder2, entryRank2, FEIS_LOCAL_ID_FLOOR2, ResultFinder2, MajorsFinder2, initialsOnly2, nameOrderOf, DancerResolver2, readPopulation2, canonicalOf2, CompResolver2, StaffFinder2, SchoolResolver2, TeamFinder2, EventFinder2, defaultBuilders2, indexPath2, indexKey2, isCurrent2, buildIndex2, ensureIndex2, listIndexes2, readPin2, youngest2, dancerResolverOf2, RegistrationResolver2, ghRemote2, httpsRemote2, fallbackRemote2, setRemote2, columnsOf2, FEATURES2, capabilityOf2, needsRelease2, resolveTag2, Release2, openRelease2, openCached2, ReleaseManager2, releases2 };
+export { DATABASES2, planAsset2, sha256File2, unzstdTo2, NAME_LEVELS2, nameLevel2, NO_CALENDAR2, FeisFinder2, entryRank2, FEIS_LOCAL_ID_FLOOR2, ResultFinder2, MajorsFinder2, readsSpanishNames2, SchoolResolver2, initialsOnly2, nameOrderOf, DancerResolver2, readPopulation2, canonicalOf2, CompResolver2, StaffFinder2, 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-hhhrh1db.js";
+} from "./chunks/index-9r4rw6xq.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 

package/dist/index.js

@@ -12,13 +12,14 @@ import {
   FEIS_LOCAL_ID_FLOOR2,
   ResultFinder2,
   MajorsFinder2,
+  readsSpanishNames2,
+  SchoolResolver2,
   initialsOnly2,
   DancerResolver2,
   readPopulation2,
   canonicalOf2,
   CompResolver2,
   StaffFinder2,
-  SchoolResolver2,
   TeamFinder2,
   EventFinder2,
   defaultBuilders2,
@@ -46,7 +47,7 @@ import {
   openCached2,
   ReleaseManager2,
   releases2
-} from "./chunks/index-hhhrh1db.js";
+} from "./chunks/index-9r4rw6xq.js";
 import {
   cacheRoot2,
   repoOf2
@@ -108,6 +109,7 @@ export {
   planAsset2 as planAsset,
   readPin2 as readPin,
   readPopulation2 as readPopulation,
+  readsSpanishNames2 as readsSpanishNames,
   releases2 as releases,
   renderArchiveTag2 as renderArchiveTag,
   repoOf2 as repoOf,

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

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

package/dist/types/dancers.d.ts

@@ -222,6 +222,7 @@ export declare class DancerResolver {
     }>;
     resolve(q: DancerQuery): Promise<DancerAnswer>;
     private formsOf;
+    private spanishHits;
     search(q: DancerSearchQuery): Promise<DancerAnswer>;
     private capped;
     get(dancerId: number): Promise<DancerRecord | null>;

package/dist/types/index.d.ts

@@ -13,7 +13,7 @@ export { type Remote, type RemoteAsset, fallbackRemote, ghRemote, httpsRemote, s
 export { type OpenOptions, Release, openCached, openRelease, resolveTag, } from "./release.js";
 export { type MajorCompetition, type MajorEvent, MajorsFinder, type ResultAnswer, ResultFinder, type ResultQuery, type ResultRow, } from "./results.js";
 export { type DancerAnswerLike, type DancerQueryLike, type DancerResolverLike, type DancerUnavailable, type RegistrationRow, type ResolvedDancer, RegistrationResolver, type ResolvedRegistration, dancerResolverOf, youngest, } from "./registrations.js";
-export { type SchoolAnswer, type SchoolCandidate, type SchoolQuery, SchoolResolver, type SchoolRung, } from "./schools.js";
+export { type SchoolAnswer, type SchoolCandidate, type SchoolQuery, SchoolResolver, type SchoolRung, readsSpanishNames, type SpanishNames, } from "./schools.js";
 export { type Capability, FEATURES, type Feature, type SchemaProbe, capabilityOf, columnsOf, needsRelease, } from "./schema.js";
 export { type EntryRow, type StreamQuery, type StreamRow, type StreamScope, entryRank, } from "./stream.js";
 export { EventFinder, type EventYear, type EventYearQuery, type ResultRoster, type RosterMember, type RosterTeam, TeamFinder, type TeamResult, } from "./teams.js";

package/dist/types/schools.d.ts

@@ -14,6 +14,11 @@ export interface SchoolCandidate {
         lo: number | null;
         hi: number | null;
     };
+    spanishNames?: SpanishNames;
+}
+export interface SpanishNames {
+    file: boolean;
+    prints: string[];
 }
 export interface SchoolAnswer {
     tag: string;
@@ -42,6 +47,7 @@ export interface SchoolReaderChoice {
     id: string;
     reader: SchoolNameParser;
 }
+export declare function readsSpanishNames(candidates: readonly SchoolCandidate[]): boolean;
 export declare const GENERIC_SCHOOL_READER: SchoolReaderChoice;
 export declare const schoolsIndex: IndexBuilder;
 export declare class SchoolResolver {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.14.0",
+	"version": "0.15.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",
@@ -45,7 +45,7 @@
 	},
 	"dependencies": {
 		"@finbheara/domain": "0.53.0",
-		"@finbheara/names": "0.25.0",
+		"@finbheara/names": "0.26.0",
 		"hyparquet": "1.31.2"
 	},
 	"devDependencies": {