@finbheara/domain 0.47.0 → 0.49.0

package/README.md

@@ -49,7 +49,7 @@ ESM, Node ≥ 22 or Bun ≥ 1.4.2. MIT. Not affiliated with or endorsed by any d
 | `@finbheara/domain/dance-types` | `danceTypes()`, `DANCE_TYPES`, `rhythmOfTime`, and the shared `DanceMatch`/`DanceRelation`/`SetRhythm`/`TimeSignature` types |
 | `@finbheara/domain/promotion` | `samePromotedRow`, `samePromotedSchool`, `samePromotedHeir`, `samePromotedName`, `questionMarksRead`, `foldCharSynonyms`: is a row the same row after a promotion (below) |
 | `@finbheara/domain/person` | `seatName`, `dancerName`, `teacherName`, `roleName`, `roleSentinelOf`, `rolePrintsNoName`, `dancerPrintsNoName`, the role lists and `SHARED_ROW_SENTINELS`: a person's print read in its role (below) |
-| `@finbheara/domain/title` | `compTitle`, `titleRelation`, `matchTitle`, `ladderOf`, `populationIn`, `populationRelation`, `roundNumbersIn`: a competition title read and matched onto syllabus entries (below) |
+| `@finbheara/domain/title` | `compTitle`, `titleRelation`, `matchTitle`, `ladderOf`, `populationIn`, `populationRelation`, `roundNumbersIn`, `codePopulation`, `secondIn`: a competition title read and matched onto syllabus entries, a code's sex suffix, a second chance (below) |
 | `@finbheara/domain/schedule` | `scheduleAt`, `sameHall`, `readRunningOrder`, the `ScheduleSlot` type: which entries a hall runs (below) |
 
 The library does no I/O and installs nothing process-wide. Every reader has a default and a
@@ -302,6 +302,12 @@ canOverlap(u12, Age.from("U14", { year: 2026 }), dancer);                 // tru
 Age.from("13 & Over", { year: 2026 }).interval();       // { lo: 13, hi: Infinity }, as "Over 13"
 ```
 
+A range is another way of writing the `Under` band at its top: `11-13` reads as `U13`, and its
+low number bounds nothing, since a youth ladder's range names the rung and not every age in it.
+A range printed from 18 up is an age bracket, and its low number is its floor:
+`Age.from("24-30", { year: 2026 })` is ages 24 to 29, born 1996 to 2001. A range that prints no
+floor of 18 or more, on a ladder that offered the adult rung, floors at 18.
+
 A competition title usually carries its age group in its words. `Age.fromTitle` finds the
 phrase, reads it as `Age.from` would, and says where it was. A title that names no age group
 is empty, not refused. Competition numbers are never read as ages.
@@ -341,7 +347,7 @@ youth band stands.
 
 An adult word beside an and-over from 18 or a range from 18 reads both as well: `adult o40` and
 `adult 18-29` are adult (`isAdult()`), and their `kind`, interval and birth years are the ones the
-band alone reads on the same ladder, a range floored at 18 where no rung sits below it. So
+band alone reads on the same ladder. So
 `Age.from("adult o40", { year: 2026 })` is born 1985 or earlier, as `o40` is. An and-over under
 18 or a range opening under 18 (`Teen & Adult 13 & Over`) admits youth, and the band stands. TIDA's
 `Senior Adult` beside an and-over is its oldest youth championship, an open championship that
@@ -424,6 +430,23 @@ A band split into parallel competitions (`Girls Under 13 A`, `Girls Under 13 B`)
 split, unless the title prints the letter. A title naming no band names nothing. Hand in the
 entries of the kind you mean: a solo championship's ages are often a team event's too.
 
+A code may carry the sex where the title does not. `codePopulation` reads a suffix against every
+code the same event printed, as a letter alone also marks sections and merges: `B` beside `G` of
+the same code (and no `A` or `C` of it) is the boys' and the girls' half, and a trailing `M` is
+boys only beside the code without it. `secondIn` says whether a print names a second chance or a
+supplementary competition beside the main one, from the words alone (`2nd Chance`, `2nd Chc`,
+`Second Chance`, `Supplementary`, `2nd` before `Open` or `Prelim`), never from a code's digit.
+
+```ts
+import { codePopulation, secondIn } from "@finbheara/domain/title";
+
+codePopulation("720OCB", ["720OCB", "720OCG"]);   // "boys"
+codePopulation("512M", ["512", "512M"]);          // "boys"
+codePopulation("713OCM", ["713OCM", "714OC"]);    // "": alone, it may be a merge
+secondIn("Preliminary Champion, Supplementary Prelim (U15)");   // true
+secondIn("Preliminary Champion, Hard Shoe (U10)");              // false
+```
+
 ## Ask a schedule
 
 A split band's competitions share their card numbers, so a card heard on a stage fits each of

package/dist/age.js

@@ -39,7 +39,7 @@ import {
   youngFloor2,
   tooYoungForMajor2,
   tooYoungForFeis2
-} from "./chunks/place-mpeps8tn.js";
+} from "./chunks/place-kmh59zkw.js";
 export {
   ADULT_FLOOR2 as ADULT_FLOOR,
   AVERAGE_AGE_DECIMALS2 as AVERAGE_AGE_DECIMALS,

package/dist/chunks/{place-y66f4138.js → place-k0p9af4f.js}

@@ -1,7 +1,7 @@
 import {
   Age2,
   ageRelation2
-} from "./place-mpeps8tn.js";
+} from "./place-kmh59zkw.js";
 import {
   validity
 } from "./place-q9kwsmzd.js";
@@ -24,6 +24,30 @@ function populationIn2(text) {
     return "boys";
   return "";
 }
+function codePopulation2(code, codes) {
+  const c = code.trim().toUpperCase();
+  const all = new Set;
+  for (const x of codes)
+    all.add(x.trim().toUpperCase());
+  all.add(c);
+  if (!/\d/.test(c))
+    return "";
+  const pair = /^(.*\d[A-Z]*?)([BG])$/.exec(c);
+  if (pair !== null) {
+    const [, stem, letter] = pair;
+    const other = letter === "B" ? "G" : "B";
+    if (all.has(stem + other) && !all.has(`${stem}A`) && !all.has(`${stem}C`))
+      return letter === "B" ? "boys" : "girls";
+  }
+  const male = /^(.*\d[A-Z]*?)-?M$/.exec(c);
+  if (male !== null && all.has(male[1]))
+    return "boys";
+  return "";
+}
+var SECOND_WORDS = /\b(?:(?:2nd|second)[\s-]*ch(?:ance|c)?\b|supplementary\b|(?:2nd|second)\s+(?:open|prelim|preliminary)\b)/;
+function secondIn2(text) {
+  return SECOND_WORDS.test(toAscii(text).toLowerCase());
+}
 function roundNumbersIn2(folded, printed) {
   const out = new Set;
   for (const m of folded.matchAll(/ rounds? ((?:\d+ (?:and )?)+)/g))
@@ -136,4 +160,4 @@ function matchTitle2(print, entries, ctx = {}) {
   });
 }
 
-export { populationIn2, roundNumbersIn2, compTitle2, populationRelation2, titleRelation2, ladderOf2, matchTitle2 };
+export { populationIn2, codePopulation2, secondIn2, roundNumbersIn2, compTitle2, populationRelation2, titleRelation2, ladderOf2, matchTitle2 };

package/dist/chunks/{place-mpeps8tn.js → place-kmh59zkw.js}

@@ -242,12 +242,14 @@ function readRange(a, b, ladder) {
       clauses: ["range-overlapping"],
       parts: [a, b]
     };
-  const below = maxWhere(ladder.caps, (c) => c < b);
+  const capBelow = maxWhere(ladder.caps, (c) => c < b);
+  const printedFloor = a >= ADULT_FLOOR2 && (capBelow === undefined || capBelow <= a);
+  const below = printedFloor ? a : capBelow;
   const adultFloor = below === undefined && ladder.adult === true && b > ADULT_FLOOR2;
   const meetsOver = ladder.overs.includes(b + 1) && !ladder.caps.some((c) => c > b);
   const clauses = [
     "range-as-under",
-    below !== undefined ? "under-floored-on-rung" : adultFloor ? "range-adult-floor" : "youngest-absorbs"
+    printedFloor ? "range-printed-floor" : below !== undefined ? "under-floored-on-rung" : adultFloor ? "range-adult-floor" : "youngest-absorbs"
   ];
   if (meetsOver)
     clauses.push("range-top-meets-over");
@@ -429,7 +431,7 @@ function fromPrint(print, context = {}) {
         throw new Error(`Age.from(${JSON.stringify(print)}): birthYears needs a competition year`);
       return birthYearsOfInterval2(iv, at);
     },
-    floorObserved: () => reading.kind !== "under" && reading.kind !== "range" || iv === null ? null : reading.clauses.includes("under-floored-on-rung") || reading.clauses.includes("range-adult-floor") || reading.clauses.includes("under-stride")
+    floorObserved: () => reading.kind !== "under" && reading.kind !== "range" || iv === null ? null : reading.clauses.includes("under-floored-on-rung") || reading.clauses.includes("range-adult-floor") || reading.clauses.includes("range-printed-floor") || reading.clauses.includes("under-stride")
   });
 }
 function fromYOB(from, to = from, context = {}) {
@@ -484,7 +486,7 @@ function sourceOf(r) {
   switch (r.kind) {
     case "range":
     case "under":
-      if (r.clauses.includes("under-stride"))
+      if (r.clauses.includes("under-stride") || r.clauses.includes("range-printed-floor"))
         return "printed-band";
       return iv.lo > YOUNGEST_FLOOR2 ? "sibling-narrowed" : "printed-band";
     case "over":

package/dist/schedule.js

@@ -1,8 +1,8 @@
-import"./chunks/place-mpeps8tn.js";
+import"./chunks/place-kmh59zkw.js";
 import {
   compTitle2,
   matchTitle2
-} from "./chunks/place-y66f4138.js";
+} from "./chunks/place-k0p9af4f.js";
 
 function hallKey(hall) {
   return hall.normalize("NFKD").replace(/\p{M}/gu, "").toLowerCase().replace(/[^a-z0-9]+/g, " ").trim();

package/dist/title.js

@@ -1,19 +1,23 @@
 import {
   populationIn2,
+  codePopulation2,
+  secondIn2,
   roundNumbersIn2,
   compTitle2,
   populationRelation2,
   titleRelation2,
   ladderOf2,
   matchTitle2
-} from "./chunks/place-y66f4138.js";
-import"./chunks/place-mpeps8tn.js";
+} from "./chunks/place-k0p9af4f.js";
+import"./chunks/place-kmh59zkw.js";
 export {
+  codePopulation2 as codePopulation,
   compTitle2 as compTitle,
   ladderOf2 as ladderOf,
   matchTitle2 as matchTitle,
   populationIn2 as populationIn,
   populationRelation2 as populationRelation,
   roundNumbersIn2 as roundNumbersIn,
+  secondIn2 as secondIn,
   titleRelation2 as titleRelation
 };

package/dist/types/age-types.d.ts

@@ -25,7 +25,7 @@ export type AgeArm = "band" | "yob" | "open" | "empty";
 export type AgeKind = "under" | "over" | "range" | "adult" | "senior" | "yob";
 export type AgeRefusal = "not-a-band" | "backwards-range" | "overlapping-ranges" | "senior-without-ladder" | "below-youngest-band" | "above-oldest-band" | "year-out-of-range";
 export type AgeSource = "sibling-narrowed" | "printed-band" | "printed-range" | "printed-yob" | "open";
-export type AgeClause = "under-floored-on-rung" | "under-stride" | "youngest-absorbs" | "over-ceiling-from-next-over" | "over-ceiling-refused-gap" | "and-over-no-ceiling" | "adult-under-ceiling" | "adult-band" | "range-overlapping" | "range-as-under" | "range-top-meets-over" | "range-adult-floor";
+export type AgeClause = "under-floored-on-rung" | "under-stride" | "youngest-absorbs" | "over-ceiling-from-next-over" | "over-ceiling-refused-gap" | "and-over-no-ceiling" | "adult-under-ceiling" | "adult-band" | "range-overlapping" | "range-as-under" | "range-top-meets-over" | "range-adult-floor" | "range-printed-floor";
 export type AgeRelation = "same" | "contains" | "overlaps" | "disjoint" | "silent";
 export type AgeRelationReason = "equal" | "a-contains-b" | "b-contains-a" | "partial" | "a-older" | "a-younger" | "a-not-a-band" | "b-not-a-band";
 export interface AgeComparison {

package/dist/types/title.d.ts

@@ -5,6 +5,8 @@ export type { EmptyReason, Validated } from "./validated.ts";
 export type { AgeComparison, AgeLadder } from "./age.ts";
 export type Population = "girls" | "boys" | "mixed";
 export declare function populationIn(text: string): Population | "";
+export declare function codePopulation(code: string, codes: Iterable<string>): Population | "";
+export declare function secondIn(text: string): boolean;
 export declare function roundNumbersIn(folded: string, printed: boolean): Set<number>;
 export interface TitleContext {
     readonly year?: number | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.47.0",
+	"version": "0.49.0",
 	"description": "Places, CLRG regions, school names, ages, dances, competition titles and schedules, and a person's print in its role, as they are printed: read, compared and told apart",
 	"keywords": [
 		"places",