@finbheara/domain 0.48.0 → 0.50.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`, `roundFold`, `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
@@ -426,10 +426,34 @@ compTitle("Treble Reel Special").invalidReason(); // "no-age"
 A spoken dash is read as a space: `boys u-17`, `Boys U-17` and `boys u- 17` read as `boys u17`,
 `girls o-16` as `girls o16`, and `under-15` as `under 15`.
 
+A count printed before `Rounds` is how many rounds are danced, and the number after it is the
+band: `Ladies Champion 3 Rounds 18 & Over` reads `[18,∞)` and no round, and `2 Rounds 1 & 2`
+lists the two rounds it counts. A number an and-over closes (`18 & Over`, `18&O`, `18+`) is the
+band, so `Round 2 - 18&O` is round 2, and so is the number after an and-over word (`Rounds 1-3
+Over 18` is rounds 1 and 3). An and-over word with no connector pops nothing: `Round 2 Plus` is
+round 2.
+
 A band split into parallel competitions (`Girls Under 13 A`, `Girls Under 13 B`) answers every
 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/chunks/{place-cdghn4v2.js → place-7jfd4m3j.js}

@@ -24,11 +24,48 @@ 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());
+}
+var ROUND_LIST = / (?:(\d+) )?(rounds?) ((?:\d+ (?:and )?)+)/g;
 function roundNumbersIn2(folded, printed) {
   const out = new Set;
-  for (const m of folded.matchAll(/ rounds? ((?:\d+ (?:and )?)+)/g))
-    for (const n of m[1].match(/\d+/g) ?? [])
-      out.add(Number(n));
+  for (const m of folded.matchAll(ROUND_LIST)) {
+    const list = m[3];
+    const after = folded.slice((m.index ?? 0) + m[0].length);
+    const ns = (list.match(/\d+/g) ?? []).map(Number);
+    const andOver = list.endsWith(" and ") && /^(?:over|o) /.test(after);
+    if (andOver || after.startsWith("+ "))
+      ns.pop();
+    if (m[1] !== undefined && m[2] === "rounds") {
+      const count = Number(m[1]);
+      if (ns.length < 2 || ns.some((n) => n < 1 || n > count))
+        continue;
+    }
+    for (const n of ns)
+      out.add(n);
+  }
   for (const m of folded.matchAll(/ r([1-9])(?= )/g))
     out.add(Number(m[1]));
   if (printed)
@@ -36,8 +73,8 @@ function roundNumbersIn2(folded, printed) {
       out.add(Number(m[1]));
   return out;
 }
-function roundFold(print) {
-  return ` ${toAscii(print).toLowerCase().replace(/(\d)(\p{L})/gu, "$1 $2").replace(/[-–—,/()&+:;|.']/g, " ").replace(/\s+/g, " ").trim()} `;
+function roundFold2(print) {
+  return ` ${toAscii(print).toLowerCase().replace(/(\d)(\p{L})/gu, "$1 $2").replace(/&/g, " and ").replace(/\+/g, " + ").replace(/[-–—,/():;|.']/g, " ").replace(/\s+/g, " ").trim()} `;
 }
 var SPLIT = / ([a-d]) $|(?:\d|girls?|boys?|lad(?:y|ies)|m[ae]n|mixed) ([a-d])(?= )/;
 var spoken = (print) => print.replace(/\b(under|over|u|o)-(?=[ \t]*\d)/giu, "$1 ");
@@ -52,7 +89,7 @@ function read(print, ctx, agePrint) {
     age = t.age;
     ageSpan = t.span;
   }
-  const folded = roundFold(print);
+  const folded = roundFold2(print);
   const rounds = [...roundNumbersIn2(folded, / rounds? /.test(folded))].sort((a, b) => a - b);
   const split = SPLIT.exec(folded);
   const empty = print.trim() === "" && (agePrint ?? "").trim() === "";
@@ -136,4 +173,4 @@ function matchTitle2(print, entries, ctx = {}) {
   });
 }
 
-export { populationIn2, roundNumbersIn2, compTitle2, populationRelation2, titleRelation2, ladderOf2, matchTitle2 };
+export { populationIn2, codePopulation2, secondIn2, roundNumbersIn2, roundFold2, compTitle2, populationRelation2, titleRelation2, ladderOf2, matchTitle2 };

package/dist/schedule.js

@@ -2,7 +2,7 @@ import"./chunks/place-kmh59zkw.js";
 import {
   compTitle2,
   matchTitle2
-} from "./chunks/place-cdghn4v2.js";
+} from "./chunks/place-7jfd4m3j.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,25 @@
 import {
   populationIn2,
+  codePopulation2,
+  secondIn2,
   roundNumbersIn2,
+  roundFold2,
   compTitle2,
   populationRelation2,
   titleRelation2,
   ladderOf2,
   matchTitle2
-} from "./chunks/place-cdghn4v2.js";
+} from "./chunks/place-7jfd4m3j.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,
+  roundFold2 as roundFold,
   roundNumbersIn2 as roundNumbersIn,
+  secondIn2 as secondIn,
   titleRelation2 as titleRelation
 };

package/dist/types/title.d.ts

@@ -5,7 +5,10 @@ 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 declare function roundFold(print: string): string;
 export interface TitleContext {
     readonly year?: number | null;
     readonly ladder?: AgeLadder;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.48.0",
+	"version": "0.50.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",
@@ -89,7 +89,7 @@
 		"prepublishOnly": "bun scripts/build.ts && bun scripts/guard-tarball.ts"
 	},
 	"dependencies": {
-		"@finbheara/names": "0.22.0"
+		"@finbheara/names": "0.23.0"
 	},
 	"devDependencies": {
 		"typescript": "7.0.2"