@finbheara/archive-client 0.52.0 → 0.53.0

package/README.md

@@ -90,6 +90,7 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `results.stream`, `majors.stream` | `results.stream`, `results.entries` | 255 |
 | `results.stream.competition`, `majors.stream.competition` | the competition fields a streamed row carries (`competition_line`, `dance_printed`, `dance`, `recalled_only`, `comp_flags`, `competitors_basis`); absent, never refused, without them | 270 |
 | `feises.dates` | `feises.dates` | 245 |
+| `feises.name` | the `name` `feises.find` and `feises.series` answer: the release's reading, the label as printed except where it lost a letter (U+FFFD) the feis's own pages print clean; `name_printed` beside it is the label verbatim. Without it `name` is the label, never refused | 350 |
 | `dancers.records` | `dancers.records` | 215 |
 | `dancers.records.names` | the `names_printed` a record of `dancers.records` carries; absent, never refused, without it | 215 |
 | `dancers.years` | `dancers.years` | 245 |
@@ -98,6 +99,7 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `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.status_printed`, `majors.status_printed` | the `status_printed` a row of `results.stream` and `results.entries` carries (a transcribed row's status cell as printed, verbatim, in printed order, `[]` where none); 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 |
@@ -258,8 +260,8 @@ await rel.feises.find({ id: "<feis, series instance or brand id>" });  // a reti
 await rel.feises.find({ name: "*Spring*", year: 2024 });
 ```
 
-One answer per feis id: dates, location, series ids, regions, and how many competitions, rows
-and captures it has.
+One answer per feis id: its `name` and the label as printed (`name_printed`), dates, location,
+series ids, regions, and how many competitions, rows and captures it has. A name glob reads both.
 
 ```ts
 const s = await rel.feises.series("Ardvarna Spring");  // a name, a host code ("fweb:ABC", "fweb:ABC26"), any feis id
@@ -653,6 +655,12 @@ or summed, and the places follow the points, not the marks. A Bucharest transcri
 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 STATUS CELL AS PRINTED, where the release carries it
+(`rel.capability("results.status_printed")`): `status_printed`, a transcribed row's status cell
+verbatim, in printed order (`["Not Recalled"]`, `["-"]`, `["*"]`, `["WQ"]`). `atts` is the
+reading of the same cell, so a cell it reads as nothing (`-`, `Not Recalled`) is told apart from
+a blank cell here. `[]` where the row prints none, and on every platform 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:
 

package/dist/chunks/{index-csh5d5m4.js → index-6np7hsst.js}

@@ -606,6 +606,18 @@ var FEATURES2 = [
     since: 350,
     calls: "the same on a row of results.stream and results.entries (scope majors)"
   },
+  {
+    feature: "results.status_printed",
+    needs: ["results:results.status_printed"],
+    since: 350,
+    calls: "the `status_printed` a row of results.stream and results.entries carries (a transcribed row's status cell as printed, verbatim, in printed order, `[]` where none): absent, never refused, on a release without it"
+  },
+  {
+    feature: "majors.status_printed",
+    needs: ["majors:results.status_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"],
@@ -624,6 +636,12 @@ var FEATURES2 = [
     since: 245,
     calls: "feises.dates"
   },
+  {
+    feature: "feises.name",
+    needs: ["results:feises.name", "results:feises.name_source"],
+    since: 350,
+    calls: "the `name` feises.find and feises.series answer (the release's reading: the label as printed, except where it lost a letter the feis's own pages print); on a release without it, `name` is the label as printed, never refused"
+  },
   {
     feature: "dancers.records",
     needs: [
@@ -1159,7 +1177,7 @@ var describeEvent = (e) => {
 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,
+  name TEXT NOT NULL, name_printed 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
 );
@@ -1179,7 +1197,7 @@ function readJsonl(path) {
 }
 var feisesIndex = {
   name: "feises",
-  version: "2",
+  version: "3",
   inputs: ["results", "feis-redirects.jsonl"],
   says: "every feis by id, platform, code, series and name, with its counts and regions",
   build(rel, out) {
@@ -1194,15 +1212,16 @@ var feisesIndex = {
     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 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();
+    const named = columnsOf2(src, "feises").has("name");
+    const feisRows = src.query(`SELECT feis_id, source, host_id, name_printed, ${named ? "name" : "name_printed AS name"}, 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);
+      put.run(f.feis_id, f.source, colon === -1 ? f.source : f.feis_id.slice(0, colon), f.host_id, f.name, 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")))
@@ -1255,8 +1274,8 @@ class FeisFinder2 {
       args.push(id, id, id);
     }
     if (q.name !== undefined) {
-      where.push("name LIKE ? ESCAPE '\\'");
-      args.push(globToLike(q.name));
+      where.push("(name LIKE ? ESCAPE '\\' OR name_printed LIKE ? ESCAPE '\\')");
+      args.push(globToLike(q.name), globToLike(q.name));
     }
     if (q.year !== undefined) {
       where.push("year = ?");
@@ -1564,7 +1583,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" : ""}${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`,
+    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" : ""}${shape.status === true ? ", r.status_printed AS status_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
   };
 }
@@ -1576,7 +1595,7 @@ function feisDates(db) {
 }
 var text = (v) => v === null || v === "" ? null : v;
 function rowOf(r, dates) {
-  const { atts, withdrawn, recalled_only, round_points_printed, ...rest } = r;
+  const { atts, withdrawn, recalled_only, round_points_printed, status_printed, ...rest } = r;
   const d = dates.get(r.event);
   return {
     ...rest,
@@ -1593,6 +1612,7 @@ function rowOf(r, dates) {
     ...round_points_printed === undefined ? {} : {
       round_points_printed: round_points_printed === null ? null : JSON.parse(round_points_printed)
     },
+    ...status_printed === undefined ? {} : { status_printed: JSON.parse(status_printed) },
     withdrawn: text(withdrawn),
     qualifier: text(rest.qualifier),
     primary_source: text(rest.primary_source),
@@ -1718,6 +1738,7 @@ class ResultFinder2 {
     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";
+    const status = (await this.rel.capability(`${db}.status_printed`)).state === "full";
     return {
       db: this.rel.db(db),
       shape: {
@@ -1727,7 +1748,8 @@ class ResultFinder2 {
         major,
         relativePlaceErr,
         roundPoints,
-        marks
+        marks,
+        status
       }
     };
   }

package/dist/cli.js

@@ -23,7 +23,7 @@ import {
   staleWarning2,
   progressMode2,
   progressRenderer2
-} from "./chunks/index-csh5d5m4.js";
+} from "./chunks/index-6np7hsst.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-csh5d5m4.js";
+} from "./chunks/index-6np7hsst.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/feises.d.ts

@@ -8,6 +8,7 @@ export interface Feis {
     token: string;
     host_id: string;
     name: string;
+    name_printed: string;
     date_lo: string | null;
     date_hi: string | null;
     date_printed: string | null;

package/dist/types/stream.d.ts

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

package/package.json

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