@finbheara/archive-client 0.49.0 → 0.51.0

package/README.md

@@ -97,6 +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 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 |
@@ -104,6 +105,7 @@ 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 |
 | `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 |
@@ -643,6 +645,13 @@ nothing in null (`[null, null, "275"]`). No slot is mapped onto a round and noth
 null where no slot serves a value and on every other source's row. `points_printed` stays the one
 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. 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:
 
@@ -737,7 +746,7 @@ 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 }] }]
@@ -756,7 +765,10 @@ roster team met the results (`exact`, `card`, `branch`) or why it did not (`no-r
 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
+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
@@ -769,7 +781,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

package/dist/chunks/{index-9wetmb53.js → index-kbg0a5pp.js}

@@ -594,6 +594,18 @@ var FEATURES2 = [
     since: 350,
     calls: "the same on a row of results.stream and results.entries (scope majors)"
   },
+  {
+    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 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",
+    needs: ["majors:results.marks_printed"],
+    since: 350,
+    calls: "the same on a row of results.stream and results.entries (scope majors)"
+  },
   {
     feature: "majors.attach_basis",
     needs: ["majors:results.attach_basis"],
@@ -748,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: [
@@ -1540,7 +1558,7 @@ function streamSql(q, shape = {}) {
   if (q.major !== undefined)
     where.push(q.major ? "r.major = 1" : "r.major = 0");
   return {
-    sql: `SELECT ${COLUMNS}${shape.competition === true ? COMPETITION_COLUMNS : ""}${shape.competitorsPrinted === true ? ", c.competitors_printed AS competitors_printed" : ""}${shape.attachBasis === true ? ", r.attach_basis AS attach_basis" : ""}${shape.major === true ? ", r.major AS major" : ""}${shape.relativePlaceErr === true ? ", r.relative_place_err AS relative_place_err" : ""}${shape.roundPoints === true ? ", r.round_points_printed AS round_points_printed" : ""} FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line${where.length === 0 ? "" : ` WHERE ${where.join(" AND ")}`} ORDER BY r.file, r.line`,
+    sql: `SELECT ${COLUMNS}${shape.competition === true ? COMPETITION_COLUMNS : ""}${shape.competitorsPrinted === true ? ", c.competitors_printed AS competitors_printed" : ""}${shape.attachBasis === true ? ", r.attach_basis AS attach_basis" : ""}${shape.major === true ? ", r.major AS major" : ""}${shape.relativePlaceErr === true ? ", r.relative_place_err AS relative_place_err" : ""}${shape.roundPoints === true ? ", r.round_points_printed AS round_points_printed" : ""}${shape.marks === true ? ", r.marks_printed AS marks_printed" : ""} FROM results r JOIN competitions c ON c.file = r.file AND c.line = r.competition_line${where.length === 0 ? "" : ` WHERE ${where.join(" AND ")}`} ORDER BY r.file, r.line`,
     args
   };
 }
@@ -1693,9 +1711,18 @@ class ResultFinder2 {
     const major = (await this.rel.capability(`${db}.major`)).state === "full";
     const relativePlaceErr = (await this.rel.capability(`${db}.relative_place_err`)).state === "full";
     const roundPoints = (await this.rel.capability(`${db}.round_points_printed`)).state === "full";
+    const marks = (await this.rel.capability(`${db}.marks_printed`)).state === "full";
     return {
       db: this.rel.db(db),
-      shape: { competition, competitorsPrinted, attachBasis, major, relativePlaceErr, roundPoints }
+      shape: {
+        competition,
+        competitorsPrinted,
+        attachBasis,
+        major,
+        relativePlaceErr,
+        roundPoints,
+        marks
+      }
     };
   }
   async* stream(q) {
@@ -3768,7 +3795,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);
@@ -3797,7 +3824,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),
@@ -3815,10 +3842,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) ?? "");
@@ -3881,24 +3908,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 }
       }))
     };
   }

package/dist/cli.js

@@ -23,7 +23,7 @@ import {
   staleWarning2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-9wetmb53.js";
+} from "./chunks/index-kbg0a5pp.js";
 import"./chunks/index-hghdy980.js";
 
 var USAGE_HEADER = "usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json] [--live] [--progress tty|plain|none]";

package/dist/index.js

@@ -85,7 +85,7 @@ import {
   PROGRESS_MODES2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-9wetmb53.js";
+} from "./chunks/index-kbg0a5pp.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/stream.d.ts

@@ -65,6 +65,7 @@ export interface StreamRow extends Partial<StreamCompetition> {
     yob_printed: string | null;
     points_printed: string | null;
     round_points_printed?: (string | null)[] | null;
+    marks_printed?: string | null;
     platform_dancer_id: string | null;
     primary_source: string | null;
     file: string;
@@ -81,6 +82,7 @@ export interface StreamShape {
     major?: boolean;
     relativePlaceErr?: boolean;
     roundPoints?: boolean;
+    marks?: boolean;
 }
 export declare const scopeDb: (s: StreamScope) => "majors" | "results";
 export declare function streamSql(q: StreamQuery, shape?: StreamShape): {

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;
@@ -84,6 +86,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.49.0",
+	"version": "0.51.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",