@finbheara/archive-client 0.10.0 → 0.12.0

package/README.md

@@ -281,7 +281,13 @@ words):
   followed through the redirects, a print read by `rel.schools`), and none of them is the asked
   school or a school its line had joined by that year (lineage edges dated in or before the asked
   year). A dancer with no school row, or a print no school reads, is unknown and never refuted. A
-  dancer that ever danced for the asked school's line is never refuted by the school.
+  dancer that ever danced for the asked school's line is never refuted by the school. For an
+  adult-category question (the asked band is the adult band, read by `@finbheara/domain`:
+  `Adult`, `Advanced Adult`, `Adult Beginner`, `Open Adult`, `Adult Masters`), a row the
+  candidate danced under 18 (at every birth year of its window, in the row's latest year)
+  refutes nothing where the candidate is 18 or over in the asked year, however long ago the row
+  is: many adult dancers danced as children at another school. An and-over band (`O18`,
+  `18 & Over`, `18+`), `Senior`, a year of birth and a youth question are unchanged.
 - `age`: the birth window misses the asked band even with one band's dance-up (`DANCE_UP_YEARS`
   of `@finbheara/domain/age`: a dancer may enter the band one year older than the dancer's own). A
   candidate the age set aside that the dance-up holds stays open (`r.initials.heldByDanceUp`).

package/dist/chunks/{index-hs72zekf.js → index-xtv455ft.js}

@@ -71,7 +71,11 @@ import { Age, DANCE_UP_YEARS, birthYearsMeet } from "@finbheara/domain/age";
 import { createIndex, indexSchema, personEncoder } from "@finbheara/domain/noun-index";
 import domainPkg from "@finbheara/domain/package.json";
 import { dancerName } from "@finbheara/domain/person";
-import { populationIn, populationRelation } from "@finbheara/domain/title";
+import {
+  compTitle,
+  populationIn,
+  populationRelation
+} from "@finbheara/domain/title";
 import {
   foldNameKey,
   surnameBlock
@@ -1055,8 +1059,11 @@ class DancerResolver2 {
       const held = [];
       const refuted = [];
       const bySchool = new Set;
+      const adultBy = adultBornBy(year);
+      const adultAsked = adultBy !== null && adultCategory(q.age, age?.age ?? null);
       const schoolFact = async (c) => {
-        const fact = await this.schoolRefutes(schoolsOf(db, c.dancer_id), line, year, q.school);
+        const returning = adultAsked && c.birth.hi !== null && c.birth.hi <= adultBy ? c.birth.lo : null;
+        const fact = await this.schoolRefutes(schoolsOf(db, c.dancer_id), line, year, q.school, returning);
         if (fact === null)
           return false;
         refuted.push({ dancer_id: c.dancer_id, why: "school", fact });
@@ -1195,20 +1202,30 @@ class DancerResolver2 {
     }
     return joined ? "lineage" : earlier ? "moved" : "none";
   }
-  async schoolRefutes(schools, line, year, asked) {
+  async schoolRefutes(schools, line, year, asked, returning = null) {
     const rows = schools.filter((s) => s.year_lo === null || s.year_lo <= year);
     if (rows.length === 0)
       return null;
     const seen = new Set;
+    const kept = [];
+    let youth = 0;
     for (const s of rows) {
       const own = await this.schoolIdsOf(s);
       if (own.length === 0 || own.some((id) => line.has(id)))
         return null;
+      if (returning !== null && youthRow(s, returning)) {
+        youth++;
+        continue;
+      }
+      kept.push(s);
       for (const id of own)
         seen.add(id);
     }
-    const last = latestSchool(rows, year);
-    return `every school row to ${year} reads ${[...seen].sort().join(", ")} (the latest ${last?.school_id ?? last?.print} in ${last?.year_hi}), none of them ${asked ?? "the asked school"} or a school its line joined by ${year}`;
+    if (kept.length === 0)
+      return null;
+    const last = latestSchool(kept, year);
+    const set = youth > 0 ? ` (${youth} youth row(s) set aside for an adult-category question)` : "";
+    return `every school row to ${year} reads ${[...seen].sort().join(", ")} (the latest ${last?.school_id ?? last?.print} in ${last?.year_hi}), none of them ${asked ?? "the asked school"} or a school its line joined by ${year}${set}`;
   }
   async schoolIdsOf(s) {
     const key = s.school_id ?? s.print;
@@ -1247,6 +1264,24 @@ class DancerResolver2 {
     return done(Age.from(c.age, { year: c.year }));
   }
 }
+function adultBornBy(year) {
+  const a = Age.from("adult", { year });
+  return a.isAge() ? a.birthYears().to : null;
+}
+function adultCategory(asked, read) {
+  if (read?.isAge() && read.isAdult())
+    return true;
+  if (asked === undefined || !("band" in asked))
+    return false;
+  const t = compTitle(asked.band).age;
+  return t?.isAge() === true && t.isAdult();
+}
+function youthRow(s, bornLo) {
+  if (bornLo === null || s.year_hi === null)
+    return false;
+  const by = adultBornBy(s.year_hi);
+  return by !== null && bornLo > by;
+}
 function birthOf(d) {
   return {
     lo: d.birth_lo,
@@ -1352,7 +1387,7 @@ function contradictionFact(x, age, slack) {
 import { Age as Age2 } from "@finbheara/domain/age";
 import {
   codePopulation,
-  compTitle,
+  compTitle as compTitle2,
   matchTitle,
   populationIn as populationIn2,
   secondIn,
@@ -1421,7 +1456,7 @@ function compOf(r, codes = []) {
   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);
+  const round = r.round ?? (r.title === null ? null : compTitle2(r.title).round?.toString() ?? null);
   return {
     competition: r.competition,
     feis_id: r.feis_id,
@@ -1682,7 +1717,7 @@ class CompResolver2 {
       if (q.title === undefined || q.title.trim() === "")
         return answer("unique", "prior-year", hits, { from, check: "unchecked" });
       const m = matchTitle(q.title, [entryOf(hit)]);
-      const r = titleRelation(m.title, compTitle(hit.title ?? "", {}));
+      const r = titleRelation(m.title, compTitle2(hit.title ?? "", {}));
       const check = {
         title: q.title,
         agrees: m.isSingular(),
@@ -2464,7 +2499,7 @@ import {
 import { join as join3 } from "path";
 
 import { Age as Age3 } from "@finbheara/domain/age";
-import { compTitle as compTitle2 } from "@finbheara/domain/title";
+import { compTitle as compTitle3 } from "@finbheara/domain/title";
 function youngest2(answers) {
   const key = (a) => {
     const iv = Age3.from(a.age, { year: null }).interval();
@@ -2544,7 +2579,7 @@ class RegistrationResolver2 {
       const printed = first !== undefined ? [] : comps.flatMap((c, i) => {
         const code = row.codes[i];
         const t = row.titles?.[code];
-        const a = t === undefined ? null : compTitle2(t).age;
+        const a = t === undefined ? null : compTitle3(t).age;
         return a?.isAge() === true && a.kind !== "yob" ? [{ age: a.ag1, year: c.feis.year, code }] : [];
       });
       const byTitle = youngest2(printed);

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   nameOrderOf,
   openRelease2,
   releases2
-} from "./chunks/index-hs72zekf.js";
+} from "./chunks/index-xtv455ft.js";
 import"./chunks/index-hne1wadw.js";
 import"./chunks/index-hghdy980.js";
 

package/dist/index.js

@@ -46,7 +46,7 @@ import {
   openCached2,
   ReleaseManager2,
   releases2
-} from "./chunks/index-hs72zekf.js";
+} from "./chunks/index-xtv455ft.js";
 import {
   cacheRoot2,
   repoOf2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/archive-client",
-	"version": "0.10.0",
+	"version": "0.12.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",
@@ -45,7 +45,7 @@
 	},
 	"dependencies": {
 		"@finbheara/domain": "0.50.0",
-		"@finbheara/names": "0.24.0",
+		"@finbheara/names": "0.25.0",
 		"hyparquet": "1.31.2"
 	},
 	"devDependencies": {