@finbheara/domain 0.7.0 → 0.9.0

package/README.md

@@ -266,7 +266,15 @@ Age.fromTitle("10-11 Single Jig").token;                // "10-11", a band, not
 Age.fromTitle("Competition 001-013 - Reel").token;      // "", a competition number
 Age.fromTitle("Senior Boys Reel 15&16").token;          // "15-16": a range beats the word
 Age.fromTitle("Beginner Adults Reel U40").token;        // "adult u40": the adult band under 40
+Age.fromTitle("Solo Championship - Adult O40").token;   // "adult o40": adult, and 40 or over
+Age.fromTitle("Adult Championship 18 - 29").token;      // "adult 18-29": adult, and the range
 Age.fromTitle("Adult / Child Reel Under 10").token;     // "u10": no adult dances in it
+Age.fromTitle("Senior Adult Ladies 19 & Over").token;   // "adult o19": "Senior Adult" is adult
+Age.fromTitle("Senior Adult Men 17 & Over").token;     // "o17": it admits under-18s
+Age.fromTitle("Championship (Adult) (A40U)").token;    // "adult u40": a split adult code
+Age.fromTitle("Traditional Set (A40O)").token;         // "adult o40"
+adultBeside("o18");                                     // "adult o18": a band beside the adult word
+adultBeside("o17");                                     // undefined: it admits youth
 ```
 
 An adult word beside an `Under N` above 18 reads both: `adult u40` is adult (`isAdult()`), with
@@ -274,6 +282,19 @@ the adult floor of 18 and a ceiling of 40, so `Age.from("adult u40", { year: 202
 1986 to 2007. At `Under 18` the ceiling meets the floor and the word alone is read. Below 18 the
 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
+`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. A
+title naming the senior word beside it reads the same: `Senior Adult` is the adult band, so
+`Senior Adult Ladies 19 & Over` is `adult o19`. A closing split adult code keeps its split:
+`(A40U)` is `adult u40`, `(A40O)` and `(A40&O)` are `adult o40`.
+
+`adultBeside(band)` is that reading as one function, the band beside the adult word as one token,
+or `undefined` where the band admits youth. A caller holding a band from another field asks it: a
+platform's printed `18&O` beside a title that reads adult is `adult o18`.
+
 An age group is the age on the first of January, so a title that admits the dancer who is
 `N` (`7 & Under`, `7/U`, `7 Years`) is the `Under N+1` group.
 

package/dist/age.js

@@ -16,7 +16,7 @@ var YEARS = /(?<![a-z0-9])(?<!\d\s*(?:&|\/|\band\b|[-\u0096–—]|\bto\b)\s*)(\
 var RANGE_DASH = String.raw`(?:\u00c2?[-\u0096–—]|\bto\b)`;
 var RANGE = new RegExp(String.raw`(?<![0-9])(?<![0-9][a-z]*)(?<!(?:^|[^a-z0-9])[a-z])(?:u\s*)?(\d{1,2})\s*${RANGE_DASH}\s*(\d{1,2})(?![a-z0-9])`, "i");
 var LEAD_RANGE = new RegExp(String.raw`^\s*([1-9]\d?)\s*${RANGE_DASH}\s*([1-9]\d?)(?![a-z0-9])(?!\s*[/&])`, "i");
-var ADULT_CODE = /^\s*a(?:\d{1,2}(?:u|o|&o))?\s*$/i;
+var ADULT_CODE = /^\s*a(?:(\d{1,2})(u|o|&o))?\s*$/i;
 var ADULT = /(?<!non[\s-])(?<!-)\b(?:adults?|advanced\s+adults?|masters?)\b/i;
 var SENIOR = /(?<!-)\bseniors?\b/i;
 var TITLE_RANGE_MIN = 3;
@@ -81,31 +81,63 @@ function ageTitleToken(title) {
   const lead = title.length - title.trimStart().length;
   PAREN.lastIndex = 0;
   let adultAside = null;
+  let adultWord = null;
   for (const m of s.matchAll(PAREN)) {
     const inner = m[1] ?? "";
     const from = lead + (m.index ?? 0) + 1;
     const i = m.index ?? 0;
     const tail = i + m[0].length === s.length && !/[a-z0-9]/i.test(s[i - 1] ?? "");
-    if (tail && ADULT_CODE.test(inner)) {
+    const code = tail ? ADULT_CODE.exec(inner) : null;
+    if (code !== null) {
+      const split = code[1] === undefined ? "" : `${/u/i.test(code[2] ?? "") ? "u" : "o"}${code[1]}`;
       const a = inner.length - inner.trimStart().length;
-      adultAside = at(title, from, a, inner.trimEnd().length, "adult");
+      adultAside = at(title, from, a, inner.trimEnd().length, adultBeside(split) ?? "adult");
       continue;
     }
+    if (adultWord !== null)
+      continue;
     const t = readAnchored(title, inner, from, true);
-    if (t.token !== "")
-      return adultOverUnder(title, s, lead, t);
+    if (t.token === "")
+      continue;
+    if (t.token === "adult") {
+      adultWord = t;
+      continue;
+    }
+    return adultOverUnder(title, s, lead, t);
   }
+  if (adultWord !== null)
+    return adultAside ?? adultWord;
   const words = readAnchored(title, s, lead);
-  return words.token === "" && adultAside !== null ? adultAside : adultOverUnder(title, s, lead, words);
+  return adultAside !== null && (words.token === "" || words.token === "adult") ? adultAside : adultOverUnder(title, s, lead, words);
 }
 var ADULT_UNDER_MIN = 18;
+function adultBeside(band) {
+  const b = band.trim().toLowerCase();
+  if (b === "")
+    return "adult";
+  const n = /^u(\d+)$/.exec(b)?.[1];
+  if (n !== undefined) {
+    if (Number(n) < ADULT_UNDER_MIN)
+      return;
+    return Number(n) > ADULT_UNDER_MIN ? `adult u${Number(n)}` : "adult";
+  }
+  const floor = /^o(\d+)$/.exec(b)?.[1] ?? /^(\d+)-\d+$/.exec(b)?.[1];
+  if (floor === undefined)
+    return band;
+  return Number(floor) < ADULT_UNDER_MIN ? undefined : `adult ${b}`;
+}
 function adultOverUnder(title, s, lead, t) {
-  const n = /^u(\d+)$/.exec(t.token)?.[1];
-  if (n === undefined || Number(n) < ADULT_UNDER_MIN)
+  if (t.token === "")
     return t;
   const a = ADULT.exec(s);
-  const token = Number(n) > ADULT_UNDER_MIN ? `adult u${n}` : "adult";
-  return a === null ? t : at(title, lead, a.index, a.index + a[0].length, token);
+  if (a === null)
+    return t;
+  const token = adultBeside(t.token);
+  if (token === undefined || token === t.token)
+    return t;
+  if (/^u\d+$/.test(t.token))
+    return at(title, lead, a.index, a.index + a[0].length, token);
+  return { token, span: t.span };
 }
 
 var YOUNGEST_FLOOR = 0;
@@ -127,6 +159,7 @@ var AND_OVER2 = /^(\d+)\s*(?:&|and\b)\s*(?:over|o)$/i;
 var RANGE2 = /^u?(\d+)\s*[-–]\s*(\d+)$/i;
 var ADULT_WORD = /^(?:adults?|ad|advanced|masters?)$/i;
 var ADULT_UNDER = /^(?:adults?|ad)[\s-]*(?:u|under\s*)(\d+)$/i;
+var ADULT_BAND = /^(?:adults?|ad)[\s-]+(\S.*)$/i;
 var SENIOR_WORD = /^seniors?$/i;
 var NO_LADDER = Object.freeze({ caps: [], overs: [], ranges: [] });
 function maxWhere(xs, pred) {
@@ -193,6 +226,12 @@ function read(token, ladder, top) {
       clauses: ["adult-under-ceiling"],
       parts: [Number(au[1])]
     };
+  const ab = au === null ? ADULT_BAND.exec(token) : null;
+  if (ab !== null) {
+    const inner = read(ab[1].trim(), { ...ladder, adult: true }, top);
+    if (inner.kind === "over" || inner.kind === "range")
+      return { ...inner, clauses: [...inner.clauses, "adult-band"], adult: true };
+  }
   if (au !== null || ADULT_WORD.test(token))
     return {
       kind: "adult",
@@ -310,7 +349,7 @@ function fromPrint(print, context = {}) {
       return b.from !== null && b.from === b.to;
     },
     isAndOver: () => iv !== null && iv.hi === Number.POSITIVE_INFINITY,
-    isAdult: () => reading.kind === "adult",
+    isAdult: () => reading.kind === "adult" || reading.adult === true,
     interval: () => iv,
     birthYears: (y) => {
       const at = y ?? year;
@@ -570,6 +609,7 @@ export {
   YOUNGEST_BAND_TOP,
   YOUNGEST_FLOOR,
   YOUNG_FLOOR,
+  adultBeside,
   ageOnJanuary1,
   ageRelation,
   ageTitleToken,

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

@@ -10,3 +10,4 @@ export interface AgeTitleToken {
     readonly span: AgeTitleSpan | null;
 }
 export declare function ageTitleToken(title: string): AgeTitleToken;
+export declare function adultBeside(band: string): string | undefined;

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" | "year-out-of-range";
 export type AgeSource = "sibling-narrowed" | "printed-band" | "printed-range" | "printed-yob" | "open";
-export type AgeClause = "under-floored-on-rung" | "youngest-absorbs" | "over-ceiling-from-next-over" | "over-ceiling-refused-gap" | "and-over-no-ceiling" | "adult-under-ceiling" | "range-overlapping" | "range-as-under" | "range-top-meets-over" | "range-adult-floor";
+export type AgeClause = "under-floored-on-rung" | "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 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/age.d.ts

@@ -1,7 +1,7 @@
 import { type AgeTitleSpan } from "./age-title.ts";
 import type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, AgeSpan, BirthYears, YOBContext, YoungFloorVerdict } from "./age-types.ts";
 import { type EmptyReason, type Validated } from "./validated.ts";
-export { type AgeTitleSpan, type AgeTitleToken, TITLE_RANGE_MAX, TITLE_RANGE_MIN, ageTitleToken, } from "./age-title.ts";
+export { type AgeTitleSpan, type AgeTitleToken, TITLE_RANGE_MAX, TITLE_RANGE_MIN, adultBeside, ageTitleToken, } from "./age-title.ts";
 export type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, AgeSpan, BirthYears, EmptyReason, Validated, YOBContext, YoungFloorVerdict, };
 export declare const YOUNGEST_FLOOR = 0;
 export declare const ADULT_FLOOR = 18;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.7.0",
+	"version": "0.9.0",
 	"description": "Places, CLRG regions, school names, ages and dances as they are printed: read, compared and told apart",
 	"keywords": [
 		"places",
@@ -73,6 +73,6 @@
 		"prepublishOnly": "bun scripts/build.ts && bun scripts/guard-tarball.ts"
 	},
 	"dependencies": {
-		"@finbheara/names": "0.18.0"
+		"@finbheara/names": "0.20.0"
 	}
 }