@finbheara/archive-client 0.38.0 → 0.40.0

package/README.md

@@ -93,6 +93,8 @@ c.features;   // [{ feature: "dancers", state: "full" | "missing", missing: [...
 | `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 |
+| `results.stream.competitors_printed`, `majors.stream.competitors_printed` | the `competitors_printed` a streamed row carries (the competed count the page printed); absent, never refused, without it | 345 |
+| `dancers.years.printed` | the `printed_regions` a dancer-year of `dancers.years` carries (every region the year printed, where `region` picks one); absent, never refused, without it | 341 |
 | `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 |
@@ -596,10 +598,12 @@ THE COMPETITION FIELDS, where the release carries them (`rel.capability("results
 | `dance` | the competition's one dance as the release reads it (`reel`), null where it reads none |
 | `recalled_only` | true where the page printed the recalled dancers only |
 | `comp_flags` | what the page printed about itself, int-packed, one bit a flag (bit 10: recalled only). The release's `DATA-DICTIONARY.md` carries the register of every bit, and a published bit never moves |
-| `competitors_basis` | what `competitors` stands on: `printed` (the page printed a competed count), `counted` (the page printed the whole field, its cards counted), `entered` or `registered` (only the top was printed: the page's entered or registered count), null where there is no number |
+| `competitors_basis` | what `competitors` stands on: `printed` (the page printed a competed count), `counted` (the page printed the whole field, its cards counted), `entered` or `registered` (only the top was printed: the page's entered or registered count), `estimated` (a majors sheet with no count that does not show its whole field: the recall rule over a recall-only sheet (twice the recalled, plus or minus 1, or the recalled where fewer than 10), else the dancers it printed, a FLOOR; never a count, so leave it out where a real count is needed), null where there is no number |
 
 A release without them streams every row with the six fields ABSENT, never null.
 
+`competitors_printed` (feature `results.stream.competitors_printed`, `majors.stream.competitors_printed` for scope `majors`) is the competed count the page itself printed, null where it printed none. `competitors` stays the best value. A release without it streams the field ABSENT.
+
 THE COMPETITION'S KEY is `competition` (`<event-year>.<comp>` at a major, `<platform>:<host>.<comp>`
 at a feis), which holds across releases. Inside one release `(file, competition_line)` is exact: a
 competition captured twice (two files of one platform) carries one `competition` in both and two
@@ -622,6 +626,7 @@ await rel.dancers.records();                   // every dancer: display, appeara
                                                // names_printed (dancers.records.names)
 await rel.dancers.records({ ids: [1001] });
 await rel.dancers.years({ ids: [1001], year: 2025 });  // region, region_source, nationals, geohash
+                                               // printed_regions (dancers.years.printed)
 await rel.feises.dates();                      // every feis id with its first and last day
 await rel.majors.tabulated({ min_true_round: 3 });     // the majors addresses marked to round 3 or later
 ```

package/dist/chunks/{index-z9zxdmw5.js → index-bs939h4v.js}

@@ -491,6 +491,18 @@ var FEATURES2 = [
     since: 270,
     calls: "the same competition fields on a row of results.stream and results.entries (scope majors): absent, never refused, on a release without them"
   },
+  {
+    feature: "results.stream.competitors_printed",
+    needs: ["results:competitions.competitors_printed"],
+    since: 345,
+    calls: "the `competitors_printed` a row of results.stream and results.entries carries (the competed count the page printed): absent, never refused, on a release without it"
+  },
+  {
+    feature: "majors.stream.competitors_printed",
+    needs: ["majors:competitions.competitors_printed"],
+    since: 345,
+    calls: "the same on a row of results.stream and results.entries (scope majors)"
+  },
   {
     feature: "majors.tabs",
     needs: ["majors:tabs.address", "majors:tabs.true_round"],
@@ -535,6 +547,12 @@ var FEATURES2 = [
     since: 245,
     calls: "dancers.years"
   },
+  {
+    feature: "dancers.years.printed",
+    needs: ["results:dancer_years.printed_regions"],
+    since: 341,
+    calls: "the `printed_regions` a dancer-year of dancers.years carries: absent, never refused, on a release without it"
+  },
   {
     feature: "teams",
     needs: [
@@ -1396,7 +1414,7 @@ function streamSql(q, shape = {}) {
   if (q.primary === true)
     where.push("(r.primary_source IS NULL OR r.primary_source = '')");
   return {
-    sql: `SELECT ${COLUMNS}${shape.competition === true ? COMPETITION_COLUMNS : ""} 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" : ""} 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
   };
 }
@@ -1538,7 +1556,8 @@ class ResultFinder2 {
     await this.rel.fetch(db);
     await this.rel.require(db === "majors" ? "majors.stream" : "results.stream");
     const competition = (await this.rel.capability(`${db}.stream.competition`)).state === "full";
-    return { db: this.rel.db(db), shape: { competition } };
+    const competitorsPrinted = (await this.rel.capability(`${db}.stream.competitors_printed`)).state === "full";
+    return { db: this.rel.db(db), shape: { competition, competitorsPrinted } };
   }
   async* stream(q) {
     const { db, shape } = await this.streamDb(q);
@@ -2221,12 +2240,16 @@ class DancerResolver2 {
     await this.rel.fetch("results");
     await this.rel.require("dancers.years");
     const db = this.rel.db("results");
-    const sql = "SELECT dancer_id, year, region, region_source, nationals, nationals_source, geohash FROM dancer_years";
+    const printed = (await this.rel.capability("dancers.years.printed")).state === "full";
+    const sql = `SELECT dancer_id, year, region, region_source, nationals, nationals_source, geohash${printed ? ", printed_regions" : ""} FROM dancer_years`;
     const yearSql = q.year === undefined ? "" : " AND year = ?";
     const yearArgs = q.year === undefined ? [] : [q.year];
     const rows = q.ids === undefined ? db.query(`${sql} WHERE 1${yearSql} ORDER BY dancer_id, year`).all(...yearArgs) : idChunks(q.ids).flatMap((c) => db.query(`${sql} WHERE dancer_id IN (${c.map(() => "?").join(",")})${yearSql}`).all(...c, ...yearArgs));
     rows.sort((a, b) => a.dancer_id - b.dancer_id || a.year - b.year);
-    return { tag: this.rel.tag, years: rows };
+    return {
+      tag: this.rel.tag,
+      years: rows.map(({ printed_regions: codes, ...y }) => codes === undefined ? y : { ...y, printed_regions: codes === "" ? [] : codes.split(",") })
+    };
   }
   async resolve(q) {
     const db = await this.rel.indexDb("dancers");

package/dist/cli.js

@@ -21,7 +21,7 @@ import {
   latestCheck2,
   within,
   staleWarning2
-} from "./chunks/index-z9zxdmw5.js";
+} from "./chunks/index-bs939h4v.js";
 import"./chunks/index-hghdy980.js";
 
 var USAGE_HEADER = "usage: idq <verb> [--cache <dir>] [--repo <owner/name>] [--json] [--live]";

package/dist/index.js

@@ -80,7 +80,7 @@ import {
   readLatestCheck2,
   latestCheck2,
   staleWarning2
-} from "./chunks/index-z9zxdmw5.js";
+} from "./chunks/index-bs939h4v.js";
 import {
   cacheRoot2,
   repoOf2

package/dist/types/dancers.d.ts

@@ -204,6 +204,7 @@ export interface DancerYear {
     nationals: string | null;
     nationals_source: string | null;
     geohash: string | null;
+    printed_regions?: string[];
 }
 export declare class DancerResolver {
     private readonly rel;

package/dist/types/stream.d.ts

@@ -18,6 +18,7 @@ export interface StreamCompetition {
     recalled_only: boolean;
     comp_flags: number;
     competitors_basis: string | null;
+    competitors_printed?: number | null;
 }
 export interface StreamRow extends Partial<StreamCompetition> {
     address: string;
@@ -70,6 +71,7 @@ export interface EntryRow extends StreamRow {
 export declare function entryRank(section: string): number;
 export interface StreamShape {
     competition?: boolean;
+    competitorsPrinted?: 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.38.0",
+	"version": "0.40.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",