@finbheara/archive-client 0.50.0 → 0.52.0

package/README.md

@@ -97,7 +97,7 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `results.attach_basis`, `majors.attach_basis` | the `attach_basis` a row of `results.query`, `majors.results`, `results.stream` and `results.entries` carries (how its `dancer_id` was answered, or why not); absent, never refused, without it | 345 |
 | `results.major`, `majors.major` | the `major` a row of `results.stream` and `results.entries` carries (1 where its competition is a main event of a T1-T3 event, exactly the rows `majors.sqlite` holds); absent without it, and the stream filter `major` is refused by name without it | 345 |
 | `results.relative_place_err`, `majors.relative_place_err` | the `relative_place_err` a row of `results.stream` and `results.entries` carries (how far below `relative_place` the true value may sit, 0 over an exact field); absent, never refused, without it | 350 |
-| `results.marks_printed`, `majors.marks_printed` | the `marks_printed` a row of `results.stream` and `results.entries` carries (the marks total a platform served, iFeis's, one string verbatim beside its `points`); absent, never refused, without it | 350 |
+| `results.marks_printed`, `majors.marks_printed` | the `marks_printed` a row of `results.stream` and `results.entries` carries (the marks total a row served or printed, iFeis's beside its `points` and a Bucharest transcript row's, one string verbatim); absent, never refused, without it | 350 |
 | `results.round_points_printed`, `majors.round_points_printed` | the `round_points_printed` a row of `results.stream` and `results.entries` carries (the per-round points a platform served, FeisFWD's, in its slot order, a slot served nothing in null); absent, never refused, without it | 350 |
 | `dancers.records.birth_consistency`, `dancers.years.birth_consistency` | the `birth_consistency` (0-100, floored: the percent of the dancer's, or the dancer-year's, readable rows that fit the birth window) and its denominator `birth_consistency_rows` a record of `dancers.records` and a dancer-year of `dancers.years` carry; absent, never refused, without it | 345 |
 | `dancers.records.birth_deadband`, `dancers.years.birth_deadband` | the `birth_deadband_rows` a record of `dancers.records` and a dancer-year of `dancers.years` carry (the readable rows a one-year dance-up alone keeps off the birth window, outside `birth_consistency` and its denominator); absent, never refused, without it | 345 |
@@ -105,7 +105,9 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `majors.tabs` | `majors.tabulated` | 215 |
 | `teams` | `teams.results`, `teams.rosters`, `teams.resultRosters` | 260 |
 | `teams.fields` | the fields `teams.results` (`age`, `gender`, `printed_status`) and `teams.rosters` (`dance`, `school_printed_as_of`, a member's `gender`) carry; absent, never refused, without it | 266 |
+| `teams.recall` | the `competitors_printed` and `recalled_only` a row of `teams.results` carries; absent, never refused, without it | 350 |
 | `events` | `events.years` | 260 |
+| `events.published` | the `published` (`results`, or `attended`: held, its dancers named in `name-school-listings.jsonl`, no place published) and `listed` (those lines) an event-year of `events.years` carries; absent, never refused, without it | 350 |
 | `upcoming.feises` | `upcoming.feises`, and the `next` of `feises.series` (null with the reason without it) | 285 |
 | `upcoming.fields`, `upcoming.entrants` | `upcoming.fields`, `upcoming.entrants` (285 and 290 carry the tables empty) | 291 |
 | `upcoming.fields.instance` | the `feis_instance_id` `upcoming.fields` carries; absent, never refused, without it | 320 |
@@ -647,8 +649,9 @@ all-round figure a page prints.
 THE MARKS TOTAL A PLATFORM SERVED, where the release carries it
 (`rel.capability("results.marks_printed")`): `marks_printed`, iFeis's served `marks` beside its
 `points`, one string verbatim (`"462.5"`). It names no round and no judge, so it is never split
-or summed, and the places follow the points, not the marks. Null where the row serves none and on
-every other source's row.
+or summed, and the places follow the points, not the marks. A Bucharest transcript row (2016-2019)
+carries its printed mark the same way, one adjudicator's mark and no `points` (`"80"`). Null where
+the row carries none and on every other source's row.
 
 THE COMPETITION FIELDS, where the release carries them (`rel.capability("results.stream.competition")`,
 `"majors.stream.competition"` for scope `majors`), are on every row, null meaning no value:
@@ -744,14 +747,15 @@ reason it is linked to neither (`TabRow`, `PanelSeat` and `FeisPanelSeat` name t
 const r = await rel.teams.results({ event: "<event>", year: 2024 });
 r.results;   // [{ address, competition, event, year, comp_no, title, category, hands, age, gender,
              //    letter, label, school_printed, school_id, place, place_printed, printed_status, tie,
-             //    competitors, atts, ... }]
+             //    competitors, competitors_printed, recalled_only, atts, ... }]
 const t = await rel.teams.rosters({ event: "<event>", year: 2024 });
 t.teams;     // [{ team, kind, event, year, comp_no, title, team_index, seq, school_id, school_printed,
              //    school_printed_as_of, dance, members: [{ seq, name_printed, name, yob, gender, dancer_id, dancer_scope }] }]
 const j = await rel.teams.resultRosters({ event: "<event>", year: 2024 });
 j.joins;     // [{ team, result_address, join_kind, via_split, roster_index, result_letter, ... }]
 const e = await rel.events.years({ event: "<event>" });
-e.years;     // [{ event, year, date_lo, date_hi, resolution, source, date_printed, place, place_printed }]
+e.years;     // [{ event, year, date_lo, date_hi, resolution, source, date_printed, place, place_printed,
+             //    published, listed }]
 ```
 
 A query names an event (case-blind), a year, both, or neither (every row). Everything comes from
@@ -762,8 +766,14 @@ roster team met the results (`exact`, `card`, `branch`) or why it did not (`no-r
 `no-school`, `no-roster`, `multi-team-unjoined`), and `result_address` is null where none joined.
 An event-year's dates are a window (`date_lo`, `date_hi`) with how fine it is (`resolution`:
 `day`, `month`, `calendar`) and what it is read from (`source`), and `place` is a place-tree node
-where the release knows one. A team result's `age` and `gender` are the competition's band and sex
-as the release reads them, `printed_status` the row's printed status cell verbatim. A roster
+where the release knows one. `published` is `results` where the event-year publishes result rows
+and `attended` where it was held and only a listing page (a recall dump) names its dancers: no
+competition or place is published, `listed` counts the event-year's lines of
+`name-school-listings.jsonl`, and its calendar row reads terminal `attended`. A team result's `age` and `gender` are the competition's band and sex
+as the release reads them, `printed_status` the row's printed status cell verbatim. Its
+`competitors` is the field: the printed count, except on a sheet that printed the recalled teams
+only (`recalled_only`), where it is the entries the event-year's programme lists, never fewer than
+the rows, and null with no list; `competitors_printed` is the printed count as printed. A roster
 team's `school_id` is its members' own school that year. Its `school_printed` is the school a
 registration system held for it on `school_printed_as_of`, often years later, so a rename or a move
 since shows there and it says nothing about the school that year. Its `dance` is the dance it was
@@ -776,7 +786,8 @@ THOSE NEWER FIELDS ARE ABSENT, NEVER NULL, ON A RELEASE THAT DOES NOT CARRY THEM
 `gender` (feature `teams.fields`, see the table above). Absent means "this release does not carry it", null
 means the release carries the field and has no value. `teams.results` and `teams.rosters` answer on
 every release the `teams` feature names, and `(await rel.capability("teams.fields")).state` says which shape
-a release has. The rows are read once per
+a release has. A team result's `competitors_printed` and `recalled_only` are feature `teams.recall`,
+absent the same way. The rows are read once per
 release into the `teams` and `events` indexes.
 
 ## Upcoming feiseanna and their competitor lists
@@ -872,7 +883,8 @@ release holds captures of that kind for the instance's platform, so a later one
 `not-captured` (it holds none). A day first observed never moves later from one release to the
 next: a stage an earlier release observed keeps its day, named in `carried` (`["row"]` for a row
 the cut no longer names, kept whole), and a retired id is listed in `formerly`. `terminal` is
-`results`, `withdrawn` (every field withdrawn), `passed-no-results` (its first day is before the
+`attended` (a majors event-year held and published with no results, only a listing naming its
+dancers: its `results` stage is `not-captured`), `results`, `withdrawn` (every field withdrawn), `passed-no-results` (its first day is before the
 cut's day), or null for a feis still ahead. Stage dates follow capture timing, not the feis's own
 order: only results after the run is a belief. `get` tries the instance id, then `formerly`, then
 a capture, then an occurrence id, and says which met (`via`). On a release without the table each
@@ -1086,7 +1098,7 @@ Every verb takes `--cache <dir>`, `--repo <owner/name>`, `--json`, `--live` and
     idq upcoming --feises [--state upcoming|no-results] [--brand <series>] [--from <date>] [--to <date>]
     idq calendar [--release <spec>] <instance|feis id|occurrence id>
     idq calendar [--brand <series>] [--tier <t>] [--from <date>] [--to <date>] [--stage <s>] [--state <s>]
-                 [--terminal results|withdrawn|passed-no-results|none]
+                 [--terminal attended|results|withdrawn|passed-no-results|none]
     idq calendar --next [--brand <series>]
     idq calendar --missing [--stage results|entrants] [--platform <p>] [--tier <t>]
                  [--kind platform-host|listing-only]

package/dist/chunks/{index-4f6jpd5e.js → index-csh5d5m4.js}

@@ -598,7 +598,7 @@ var FEATURES2 = [
     feature: "results.marks_printed",
     needs: ["results:results.marks_printed"],
     since: 350,
-    calls: "the `marks_printed` a row of results.stream and results.entries carries (the marks total a platform served, iFeis's, one string verbatim): absent, never refused, on a release without it"
+    calls: "the `marks_printed` a row of results.stream and results.entries carries (the marks total a row served or printed, iFeis's and a Bucharest transcript row's, one string verbatim): absent, never refused, on a release without it"
   },
   {
     feature: "majors.marks_printed",
@@ -760,6 +760,12 @@ var FEATURES2 = [
     since: 266,
     calls: "the fields teams.results (age, gender, printed_status) and teams.rosters (dance, school_printed_as_of, a member's gender) carry where present: absent, never refused, on a release without them"
   },
+  {
+    feature: "teams.recall",
+    needs: ["table:team_results.competitors_printed", "table:team_results.recalled_only"],
+    since: 350,
+    calls: "the competitors_printed and recalled_only a row of teams.results carries (competitors is the field, on a recall-only sheet the entries its programme lists): absent, never refused, on a release without them"
+  },
   {
     feature: "events",
     needs: [
@@ -777,6 +783,12 @@ var FEATURES2 = [
     since: 260,
     calls: "events.years (the events index)"
   },
+  {
+    feature: "events.published",
+    needs: ["table:event_years.published", "table:event_years.listed"],
+    since: 350,
+    calls: "the `published` (`results`, or `attended`: held, its dancers named in name-school-listings.jsonl, no place published) and `listed` an event-year of events.years carries: absent, never refused, on a release without them"
+  },
   {
     feature: "upcoming.feises",
     needs: [
@@ -3789,7 +3801,7 @@ CREATE TABLE result(address TEXT PRIMARY KEY, competition TEXT, event TEXT, year
 	card TEXT, comp_no TEXT, title TEXT, category TEXT, hands INTEGER, letter TEXT, label TEXT,
 	name_printed TEXT, school_printed TEXT, school_loc TEXT, school_id TEXT, place INTEGER,
 	place_printed TEXT, tie INTEGER, competitors INTEGER, atts TEXT, age TEXT, gender TEXT,
-	printed_status TEXT, ord INTEGER);
+	printed_status TEXT, competitors_printed INTEGER, recalled_only INTEGER, ord INTEGER);
 CREATE TABLE roster_team(team TEXT PRIMARY KEY, kind TEXT, event TEXT, year INTEGER,
 	comp_no TEXT, title TEXT, team_index TEXT, seq INTEGER, school_id TEXT, school_printed TEXT,
 	dance TEXT, school_printed_as_of TEXT, ord INTEGER);
@@ -3818,7 +3830,7 @@ async function readTables(rel, tables) {
 }
 var teamsIndex = {
   name: "teams",
-  version: "2",
+  version: "3",
   inputs: TEAM_TABLES.map(tableAsset),
   says: "the team results, the roster teams with their members, and how they join, by event-year",
   load: (rel) => readTables(rel, TEAM_TABLES),
@@ -3836,10 +3848,10 @@ var teamsIndex = {
       ey.set(k, { event, year });
       putEy.run(k, event, year);
     }
-    const putR = out.prepare("INSERT OR IGNORE INTO result VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    const putR = out.prepare("INSERT OR IGNORE INTO result VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     let ord = 0;
     for (const r of t.team_results)
-      putR.run(str2(r.address), str2(r.slug), str2(r.event), num2(r.year), str2(r.card), str2(r.comp_no), str2(r.title), str2(r.category), num2(r.hands), str2(r.letter), str2(r.label), str2(r.name_printed), str2(r.school_printed), str2(r.school_loc), str2(r.school_id), num2(r.place), str2(r.place_printed), num2(r.tie), num2(r.competitors), JSON.stringify(strs(r.atts)), str2(r.age), str2(r.gender), JSON.stringify(strs(r.printed_status)), ord++);
+      putR.run(str2(r.address), str2(r.slug), str2(r.event), num2(r.year), str2(r.card), str2(r.comp_no), str2(r.title), str2(r.category), num2(r.hands), str2(r.letter), str2(r.label), str2(r.name_printed), str2(r.school_printed), str2(r.school_loc), str2(r.school_id), num2(r.place), str2(r.place_printed), num2(r.tie), num2(r.competitors), JSON.stringify(strs(r.atts)), str2(r.age), str2(r.gender), JSON.stringify(strs(r.printed_status)), num2(r.competitors_printed), num2(r.recalled_only), ord++);
     const putT = out.prepare("INSERT OR IGNORE INTO roster_team VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     for (const r of t.roster_teams) {
       const e = ey.get(str2(r.event_year) ?? "");
@@ -3859,23 +3871,23 @@ var teamsIndex = {
 };
 var EVENTS_SCHEMA = `CREATE TABLE event_year(event TEXT NOT NULL, year INTEGER NOT NULL,
 	date_lo TEXT, date_hi TEXT, resolution TEXT, source TEXT, date_printed TEXT, place TEXT,
-	place_printed TEXT, PRIMARY KEY(event, year))`;
+	place_printed TEXT, published TEXT, listed INTEGER, PRIMARY KEY(event, year))`;
 var eventsIndex = {
   name: "events",
-  version: "1",
+  version: "2",
   inputs: [tableAsset("event_years")],
   says: "every event-year: its dates (and how fine they are) and its place",
   load: (rel) => readTables(rel, ["event_years"]),
   build(_rel, out, loaded) {
     const rows = loaded.event_years ?? [];
     out.run(EVENTS_SCHEMA);
-    const put = out.prepare("INSERT OR IGNORE INTO event_year VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    const put = out.prepare("INSERT OR IGNORE INTO event_year VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     for (const r of rows) {
       const event = str2(r.event);
       const year = num2(r.year);
       if (event === null || year === null)
         continue;
-      put.run(event, year, str2(r.date_lo), str2(r.date_hi), str2(r.resolution), str2(r.source), JSON.stringify(strs(r.date_printed)), str2(r.place), JSON.stringify(strs(r.place_printed)));
+      put.run(event, year, str2(r.date_lo), str2(r.date_hi), str2(r.resolution), str2(r.source), JSON.stringify(strs(r.date_printed)), str2(r.place), JSON.stringify(strs(r.place_printed)), str2(r.published), num2(r.listed));
     }
     out.run("CREATE INDEX event_year_event ON event_year(event COLLATE NOCASE)");
   }
@@ -3902,24 +3914,29 @@ class TeamFinder2 {
   db() {
     return this.rel.indexDb("teams");
   }
+  async hasRecall() {
+    return (await this.rel.capability("teams.recall")).state === "full";
+  }
   async hasFields() {
     return (await this.rel.capability("teams.fields")).state === "full";
   }
   async results(q = {}) {
     const db = await this.db();
     const fields = await this.hasFields();
+    const recall = await this.hasRecall();
     const w = whereOf(q);
     const rows = db.query(`SELECT address, competition, event, year, card, comp_no, title, category, hands, letter,
 				        label, name_printed, school_printed, school_loc, school_id, place, place_printed, tie,
-				        competitors, atts${fields ? ", age, gender, printed_status" : ""}
+				        competitors, atts${fields ? ", age, gender, printed_status" : ""}${recall ? ", competitors_printed, recalled_only" : ""}
 				 FROM result${w.sql} ORDER BY year, event, competition, place IS NULL, place, ord`).all(...w.args);
     return {
       tag: this.rel.tag,
       asked: q,
-      results: rows.map(({ printed_status, ...r }) => ({
+      results: rows.map(({ printed_status, recalled_only, ...r }) => ({
         ...r,
         atts: JSON.parse(r.atts),
-        ...printed_status === undefined ? {} : { printed_status: JSON.parse(printed_status ?? "[]") }
+        ...printed_status === undefined ? {} : { printed_status: JSON.parse(printed_status ?? "[]") },
+        ...recalled_only === undefined ? {} : { recalled_only: recalled_only === 1 }
       }))
     };
   }
@@ -3969,15 +3986,18 @@ class EventFinder2 {
   async years(q = {}) {
     const db = await this.rel.indexDb("events");
     const w = whereOf(q);
-    const rows = db.query(`SELECT event, year, date_lo, date_hi, resolution, source, date_printed, place, place_printed
+    const rows = db.query(`SELECT event, year, date_lo, date_hi, resolution, source, date_printed, place, place_printed,
+				        published, listed
 				 FROM event_year${w.sql} ORDER BY year, event`).all(...w.args);
     return {
       tag: this.rel.tag,
       asked: q,
-      years: rows.map((r) => ({
+      years: rows.map(({ published, listed, ...r }) => ({
         ...r,
         date_printed: JSON.parse(r.date_printed),
-        place_printed: JSON.parse(r.place_printed)
+        place_printed: JSON.parse(r.place_printed),
+        ...published === "results" || published === "attended" ? { published } : {},
+        ...listed === null ? {} : { listed }
       }))
     };
   }
@@ -4177,6 +4197,7 @@ var CALENDAR_STAGE_STATES2 = [
   "not-captured"
 ];
 var CALENDAR_TERMINALS2 = [
+  "attended",
   "results",
   "withdrawn",
   "passed-no-results"

package/dist/cli.js

@@ -23,7 +23,7 @@ import {
   staleWarning2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-4f6jpd5e.js";
+} from "./chunks/index-csh5d5m4.js";
 import"./chunks/index-hghdy980.js";
 
 var USAGE_HEADER = "usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json] [--live] [--progress tty|plain|none]";
@@ -422,7 +422,7 @@ var VERBS = [
       "                                    the day first observed and the capture that observed it",
       "  calendar [--brand <series>] [--tier T1..T4] [--from <date>] [--to <date>]",
       "           [--stage announced|syllabus|entrants|run|results] [--state observed|pending|not-captured]",
-      "           [--terminal results|withdrawn|passed-no-results|none]",
+      "           [--terminal attended|results|withdrawn|passed-no-results|none]",
       "                                    the instances a query names, by first day; each stage's",
       "                                    expected day with its basis and n where the release has them",
       "  calendar --next [--brand <series>]",

package/dist/index.js

@@ -85,7 +85,7 @@ import {
   PROGRESS_MODES2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-4f6jpd5e.js";
+} from "./chunks/index-csh5d5m4.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/calendar.d.ts

@@ -3,7 +3,7 @@ export type CalendarStage = "announced" | "syllabus" | "entrants" | "run" | "res
 export declare const CALENDAR_STAGES: readonly CalendarStage[];
 export type CalendarStageState = "observed" | "pending" | "not-captured";
 export declare const CALENDAR_STAGE_STATES: readonly CalendarStageState[];
-export type CalendarTerminal = "results" | "withdrawn" | "passed-no-results";
+export type CalendarTerminal = "attended" | "results" | "withdrawn" | "passed-no-results";
 export declare const CALENDAR_TERMINALS: readonly CalendarTerminal[];
 export type CalendarExpectedBasis = "announced" | "brand" | "platform" | "pooled" | "roster-window" | "unmeasured";
 export interface CalendarExpected {

package/dist/types/teams.d.ts

@@ -28,6 +28,8 @@ export interface TeamResult {
     age?: string | null;
     gender?: string | null;
     printed_status?: string[];
+    competitors_printed?: number | null;
+    recalled_only?: boolean;
 }
 export interface RosterMember {
     seq: number;
@@ -77,6 +79,8 @@ export interface EventYear {
     date_printed: string[];
     place: string | null;
     place_printed: string[];
+    published?: "results" | "attended";
+    listed?: number;
 }
 export declare const teamsIndex: IndexBuilder;
 export declare const eventsIndex: IndexBuilder;
@@ -84,6 +88,7 @@ export declare class TeamFinder {
     private readonly rel;
     constructor(rel: Release);
     private db;
+    private hasRecall;
     private hasFields;
     results(q?: EventYearQuery): Promise<{
         tag: string;

package/package.json

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