@finbheara/archive-client 0.2.0 → 0.3.1

package/README.md

@@ -189,7 +189,8 @@ print exactly as the release published it, then the print read by `@finbheara/do
 reader at its filing key (`sn3`) and at its real words. `ambiguous` and `none` are answers: a
 best guess is never promoted to `unique`. `region` drops only a candidate the registry places in
 other regions, and keeps one it places nowhere. A print the reader refuses (a placeholder)
-answers `none` with the reason.
+answers `none` with the reason. An id (or a retired id followed) answers with every print its
+rows were published under and their rows, so it agrees with each print lookup of that school.
 
 Every answer carries the release tag it came from.
 
@@ -249,6 +250,10 @@ A FEIS-LOCAL ID (`FEIS_LOCAL_ID_FLOOR`, 2^34, and up) is valid in its release on
 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.
 
+A MAJORS ID (under the floor) is kept across releases on a best-effort basis only: a merge
+retires one, a split mints one, and a renumbered source page can hand one to another dancer. A
+caller that joins ids across releases checks the name and the rows it expects.
+
 ## Results and the majors
 
 ```ts
@@ -284,6 +289,8 @@ c.source;     // "syllabus" | "prior-year" | "title"
 c.kind;       // "championship" | "grade" | "unrated"
 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.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
@@ -326,6 +333,21 @@ 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.
 
+`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
+open the feis prints is `713OCM`), and `age_printed` keeps the platform's own field (`U10`). A
+joined code at the bottom of its series stays open below (`710OC/711OC` with no open under 10
+beside it is `U11/11yr`, every age under 11), as a younger dancer dances up into it.
+
+`population` is the sex the release states, else a population word in the title, else the
+code's sex suffix read with every code its feis printed (`codePopulation` from
+`@finbheara/domain/title`: `720OCB` beside `720OCG` is boys and girls, `512M` beside `512` is
+boys, a lone `713OCM` says nothing), else the release's `mixed` for a grade or a preliminary
+championship. `second` is read from the words of the title and the platform's level and dance
+fields (`secondIn`: `2nd Chance`, `2nd Chc`, `Second Chance`, `Supplementary Prelim`, `2nd Open
+Champ`), and never from a code's digit, which marks a round's half at some hosts (`610PC2H`).
+
 ## Registrations
 
 ```ts

package/dist/chunks/{index-6e2gb6sk.js → index-3va2jzse.js}

@@ -655,9 +655,11 @@ function ageEvidence(d, asked) {
 
 import { Age as Age2 } from "@finbheara/domain/age";
 import {
+  codePopulation,
   compTitle,
   matchTitle,
   populationIn as populationIn2,
+  secondIn,
   titleRelation
 } from "@finbheara/domain/title";
 var LEVEL = Object.freeze({
@@ -674,17 +676,25 @@ 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
+  file TEXT NOT NULL, line INTEGER NOT NULL, age_source TEXT, age_printed TEXT,
+  gender_source TEXT, level_printed TEXT, dance_printed TEXT
 );
 `;
 var INDEXES = [
   "CREATE INDEX comp_feis_code ON comp(feis_id, code_fold)",
   "CREATE INDEX comp_brand_year ON comp(brand_id, year)"
 ];
+var OPTIONAL = [
+  "age_source",
+  "age_printed",
+  "gender_source",
+  "level_printed",
+  "dance_printed"
+];
 var fold = (code) => code.trim().toLowerCase();
 var compsIndex = {
   name: "comps",
-  version: "1",
+  version: "2",
   inputs: ["results"],
   says: "every competition by its feis and its own code, with its series and year",
   build(rel, out) {
@@ -697,19 +707,23 @@ 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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-    for (const c of src.query("SELECT competition, event, year, comp_no, title, age, gender, feis_level, round, source, file, line FROM competitions WHERE comp_no IS NOT NULL AND trim(comp_no) != '' ORDER BY file, line").iterate()) {
+    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);
+      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);
     }
     for (const s of INDEXES)
       out.run(s);
   }
 };
-function compOf(r) {
+function compOf(r, codes = []) {
   const lv = r.feis_level;
   const kind = lv === null ? "unrated" : lv >= 600 ? "championship" : "grade";
-  const pop = populationIn2(r.gender ?? "") || populationIn2(r.title ?? "");
+  const stated = r.gender_source === "level" ? "" : populationIn2(r.gender ?? "");
+  const pop = stated || populationIn2(r.title ?? "") || (r.platform === "ifeis" && codes.length > 0 ? codePopulation(r.code, codes) : "") || populationIn2(r.gender ?? "");
+  const second = [r.title, r.level_printed, r.dance_printed].some((t) => t != null && secondIn(t));
   const round = r.round ?? (r.title === null ? null : compTitle(r.title).round?.toString() ?? null);
   return {
     competition: r.competition,
@@ -721,7 +735,10 @@ function compOf(r) {
     feis_level: lv,
     level: lv === null ? null : LEVEL[lv] ?? null,
     age: r.age,
+    age_source: r.age_source ?? null,
+    age_printed: r.age_printed ?? null,
     population: pop === "" ? null : pop,
+    second,
     round,
     canonical: canonicalOf2(lv, r.age),
     platform: r.platform,
@@ -828,7 +845,12 @@ class CompResolver2 {
     const marks = feisIds.map(() => "?").join(", ");
     const sql = `SELECT * FROM comp WHERE feis_id IN (${marks})${code !== undefined ? " AND code_fold = ?" : ""} ORDER BY file, line`;
     const args = code !== undefined ? [...feisIds, fold(code)] : [...feisIds];
-    return db.query(sql).all(...args).map(compOf);
+    const rows = db.query(sql).all(...args);
+    const all = code === undefined ? rows : db.query(`SELECT feis_id, code FROM comp WHERE feis_id IN (${marks})`).all(...feisIds);
+    const codes = new Map;
+    for (const r of all)
+      codes.set(r.feis_id, [...codes.get(r.feis_id) ?? [], r.code]);
+    return rows.map((r) => compOf(r, codes.get(r.feis_id) ?? []));
   }
   async idsOf(brand, year) {
     return (await this.ofSeries("", brand, year, "series")).feis_ids;
@@ -1437,7 +1459,7 @@ var encoderOf = (r) => schoolEncoder({ reader: r.reader });
 var TABLE = "school_name";
 var schoolsIndex = {
   name: "schools",
-  version: "1",
+  version: "2",
   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}`],
@@ -1453,6 +1475,7 @@ var schoolsIndex = {
     const putPair = out.prepare("INSERT INTO print_id VALUES (?, ?, ?)");
     for (const r of pairs)
       putPair.run(r.p, r.s, r.n);
+    out.run("CREATE INDEX print_id_school ON print_id(school_id)");
     const names = createIndex3(out, encoder, {
       table: TABLE
     });
@@ -1512,9 +1535,13 @@ class SchoolResolver2 {
         ...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([candidate(a, "id", 0, [])]);
+      return answer([byId(a, "id")]);
     let live = a;
     const seen = new Set;
     for (;; ) {
@@ -1525,7 +1552,7 @@ class SchoolResolver2 {
       live = r.new_id;
     }
     if (live !== a)
-      return answer([candidate(live, "redirect", 0, [])], { redirected: { from: a, to: live } });
+      return answer([byId(live, "redirect")], { redirected: { from: a, to: live } });
     const byPrints = (prints, by) => {
       const ids = new Map;
       const q2 = db.query("SELECT school_id, rows FROM print_id WHERE print = ?");

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   nameOrderOf,
   openRelease2,
   releases2
-} from "./chunks/index-6e2gb6sk.js";
+} from "./chunks/index-3va2jzse.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 
@@ -690,7 +690,7 @@ async function main(argv, io = {}) {
         out(a, () => {
           say(`${a.feis.asked}  ${a.year ?? "?"}  ${a.held ? `held: ${a.feis.feis_ids.join(", ")}` : "not held"}  series ${a.feis.brand_id ?? "-"} (years ${a.years.join(", ") || "-"})  in ${a.tag}`);
           for (const c of a.entries)
-            say(`  ${c.code}  ${c.kind}  ${c.level ?? "-"}  ${c.age ?? "-"}  ${c.population ?? "-"}  "${c.title ?? ""}"`);
+            say(`  ${c.code}  ${c.kind}  ${c.level ?? "-"}  ${c.age ?? "-"}  ${c.population ?? "-"}${c.second ? "  second" : ""}  "${c.title ?? ""}"`);
           say(`${a.entries.length} comp(s)`);
         });
         rel.close();

package/dist/index.js

@@ -41,7 +41,7 @@ import {
   openCached2,
   ReleaseManager2,
   releases2
-} from "./chunks/index-6e2gb6sk.js";
+} from "./chunks/index-3va2jzse.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/comps.d.ts

@@ -15,7 +15,10 @@ export interface Comp {
     feis_level: number | null;
     level: string | null;
     age: string | null;
+    age_source: string | null;
+    age_printed: string | null;
     population: Population | null;
+    second: boolean;
     round: string | null;
     canonical: string | null;
     platform: string;
@@ -107,8 +110,13 @@ interface CompRow {
     round: string | null;
     platform: string;
     captures: number;
+    age_source?: string | null;
+    age_printed?: string | null;
+    gender_source?: string | null;
+    level_printed?: string | null;
+    dance_printed?: string | null;
 }
-export declare function compOf(r: CompRow): Comp;
+export declare function compOf(r: CompRow, codes?: readonly string[]): Comp;
 export declare function canonicalOf(level: number | null, age: string | null): string | null;
 export declare class CompResolver {
     private readonly rel;

package/package.json

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