@finbheara/domain 0.51.0 → 0.53.0

package/README.md

@@ -44,9 +44,9 @@ ESM, Node ≥ 22 or Bun ≥ 1.4.2. MIT. Not affiliated with or endorsed by any d
 | `@finbheara/domain/tune` | `tune()`, `tuneRelation`, `tempoLegal`, `settingAt`, `TUNE_NODES`: the CLRG set dance list, each tune with its time, speeds and bars |
 | `@finbheara/domain/ceili` | `ceili()`, `ceiliRelation`, `CEILI_NODES`: the céilí handbook dances |
 | `@finbheara/domain/dance` | `dance()`: a print read as a tune and a céilí dance, narrowed by its round |
-| `@finbheara/domain/age` | `Age.from`, `Age.fromYOB`, `Age.fromTitle`, `ageTitleToken`, `ageRelation`, `canOverlap`, `averageAge`, `isAveraged`, `intersectBirthYears`, `validYOB`, the age constants |
+| `@finbheara/domain/age` | `Age.from`, `Age.fromYOB`, `Age.fromTitle`, `ageTitleToken`, `ageRelation`, `canOverlap`, `averageAge`, `isAveraged`, `intersectBirthYears`, `validYOB`, `DEFAULT_ADULT_KEYWORDS`, the age constants |
 | `@finbheara/domain/noun-index` | `createIndex`, `indexSchema`, `personEncoder`, `roleEncoder`, `roleSchoolGlob`, and the `SqlHandle`/`NounEncoder` types: a database-backed name map (below) |
-| `@finbheara/domain/dance-types` | `danceTypes()`, `DANCE_TYPES`, `rhythmOfTime`, and the shared `DanceMatch`/`DanceRelation`/`SetRhythm`/`TimeSignature` types |
+| `@finbheara/domain/dance-types` | `danceTypes()`, `DANCE_TYPES`, `GRADE_DANCES` and `isGradeDance()` (the six solo dances a grade is held in, per dance), `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`, `roundFold`, `codePopulation`, `secondIn`: a competition title read and matched onto syllabus entries, a code's sex suffix, a second chance (below) |
@@ -354,6 +354,31 @@ band alone reads on the same ladder. So
 `Senior Adult` beside an and-over is its oldest youth championship, an open championship that
 qualifies for the Worlds, so `Senior Adult Ladies 19 & Over` is `o19`. A closing split
 adult code keeps its split: `(A40U)` is `adult u40`, `(A40O)` and `(A40&O)` are `adult o40`.
+An age cell that names a level beside the adult word, either side (`Advanced Adult`, `Open
+Adults`, `Novice Adult`, `Adult Beginner`, `Adult Prelim`), is the adult rung, 18 and over: the
+level is the competition's grade. A level word alone (`Novice`, `Open`) reads no age.
+
+**The adult category is not an age of 18 or over.** `O18`, `18 & Over`, `Over 21` and `Senior` are
+open-age competitions, danced mostly by dancers who came up through the youth bands: they read
+their band, and `isAdult()` is false. `Adult`, `Novice Adult`, `Adult Beginner`, `Adult Masters` and
+`Masters` name the adult category, a division with entry rules of its own (no youth competition
+for some years, or never danced as a youth): they read `[18, ∞)` unless a band beside them splits
+it, and `isAdult()` is true. Ask `isAdult()` for the category and `interval()` for the age.
+
+Which words name the category is set by whoever runs the competition, and it differs by place and
+year. Pass the list you hold for the competition as `adultKeywords` (on `Age.from`, `Age.fromTitle`
+and `compTitle`). `DEFAULT_ADULT_KEYWORDS` is `["Adult", "Masters"]`. A keyword matches in either
+case and its plural, several in a row read as one (`Adult Masters`), and the keyword `Adult` also
+brings `Ad`, a bare `Advanced` and the `(A)` code. `[]` says no word names the category there.
+
+```ts
+import { Age, DEFAULT_ADULT_KEYWORDS } from "@finbheara/domain/age";
+
+Age.from("O18", { year: 2026 }).isAdult();                              // false: an age
+Age.from("Adult Masters", { year: 2026 }).isAdult();                    // true: the category
+Age.from("Veterans", { year: 2026, adultKeywords: ["Veteran"] }).isAdult(); // true, by your list
+Age.fromTitle("Adult Ladies Over 21", { year: 2011, adultKeywords: [] }).token; // "o21"
+```
 
 `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

package/dist/age.js

@@ -1,4 +1,5 @@
 import {
+  DEFAULT_ADULT_KEYWORDS2,
   printsUnderOpen2,
   printsAdultCode2,
   TITLE_RANGE_MIN2,
@@ -39,13 +40,14 @@ import {
   youngFloor2,
   tooYoungForMajor2,
   tooYoungForFeis2
-} from "./chunks/place-kmh59zkw.js";
+} from "./chunks/place-w6d4xfzc.js";
 export {
   ADULT_FLOOR2 as ADULT_FLOOR,
   AVERAGE_AGE_DECIMALS2 as AVERAGE_AGE_DECIMALS,
   Age2 as Age,
   AgeMisuseError2 as AgeMisuseError,
   DANCE_UP_YEARS2 as DANCE_UP_YEARS,
+  DEFAULT_ADULT_KEYWORDS2 as DEFAULT_ADULT_KEYWORDS,
   MAJORS_FLOOR_YEARS2 as MAJORS_FLOOR_YEARS,
   MIN_FEIS_AGE2 as MIN_FEIS_AGE,
   MIN_MAJOR_AGE2 as MIN_MAJOR_AGE,

package/dist/ceili.js

@@ -4,8 +4,8 @@ import {
   ceiliById2,
   ceili2,
   ceiliRelation2
-} from "./chunks/place-gd57gavk.js";
-import"./chunks/place-ng98cts4.js";
+} from "./chunks/place-3xxgddqw.js";
+import"./chunks/place-3pgn1jgx.js";
 export {
   CEILI_NODES2 as CEILI_NODES,
   allCeilis2 as allCeilis,

package/dist/chunks/{place-ng98cts4.js → place-3pgn1jgx.js}

@@ -99,6 +99,18 @@ var DANCE_TYPES2 = Object.freeze([
   "traditional-set",
   "set-dance"
 ]);
+var GRADE_DANCES2 = Object.freeze([
+  "reel",
+  "light-jig",
+  "single-jig",
+  "slip-jig",
+  "treble-jig",
+  "hornpipe"
+]);
+var GRADED = new Set(GRADE_DANCES2);
+function isGradeDance2(d) {
+  return d != null && GRADED.has(d);
+}
 function rhythmOfTime2(time) {
   return time === "2/4" || time === "4/4" ? "hornpipe" : "jig";
 }
@@ -138,4 +150,4 @@ function isDanceTypePrint2(print) {
   return danceTypes2(print).length > 0;
 }
 
-export { foldDancePrint, splitTempo, matchNodes, candidateRelation, DANCE_TYPES2, rhythmOfTime2, danceTypes2, danceTypePrints2, isDanceTypePrint2 };
+export { foldDancePrint, splitTempo, matchNodes, candidateRelation, DANCE_TYPES2, GRADE_DANCES2, isGradeDance2, rhythmOfTime2, danceTypes2, danceTypePrints2, isDanceTypePrint2 };

package/dist/chunks/{place-gd57gavk.js → place-3xxgddqw.js}

@@ -3,7 +3,7 @@ import {
   matchNodes,
   candidateRelation,
   isDanceTypePrint2
-} from "./place-ng98cts4.js";
+} from "./place-3pgn1jgx.js";
 import {
   validity
 } from "./place-q9kwsmzd.js";

package/dist/chunks/{place-tpj00cfp.js → place-4gycgaw0.js}

@@ -5,7 +5,7 @@ import {
   candidateRelation,
   rhythmOfTime2,
   isDanceTypePrint2
-} from "./place-ng98cts4.js";
+} from "./place-3pgn1jgx.js";
 import {
   validity
 } from "./place-q9kwsmzd.js";

package/dist/chunks/{place-7jfd4m3j.js → place-dn6qk21g.js}

@@ -1,7 +1,7 @@
 import {
   Age2,
   ageRelation2
-} from "./place-kmh59zkw.js";
+} from "./place-w6d4xfzc.js";
 import {
   validity
 } from "./place-q9kwsmzd.js";
@@ -79,7 +79,11 @@ function roundFold2(print) {
 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 ");
 function read(print, ctx, agePrint) {
-  const actx = { year: ctx.year ?? null, ...ctx.ladder ? { ladder: ctx.ladder } : {} };
+  const actx = {
+    year: ctx.year ?? null,
+    ...ctx.ladder ? { ladder: ctx.ladder } : {},
+    ...ctx.adultKeywords ? { adultKeywords: ctx.adultKeywords } : {}
+  };
   let age;
   let ageSpan = null;
   if (agePrint !== undefined && agePrint.trim() !== "") {
@@ -130,7 +134,7 @@ function ladderOf2(bands) {
     const bare = Age2.from(b.ag0, { year: null });
     if (!bare.isValid())
       continue;
-    if (bare.isAdult())
+    if (b.isAdult())
       adult = true;
     const [p, q] = bare.parts;
     if (bare.kind === "under" && p !== undefined)

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

@@ -2,6 +2,29 @@ import {
   validity
 } from "./place-q9kwsmzd.js";
 
+var DEFAULT_ADULT_KEYWORDS2 = Object.freeze(["Adult", "Masters"]);
+var ADULT_STEM = "adult";
+var escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function stem(keyword) {
+  const k = keyword.trim().toLowerCase().replace(/\s+/g, " ");
+  return k.length > 2 && k.endsWith("s") ? k.slice(0, -1) : k;
+}
+var cache = new Map;
+function adultPatterns(keywords) {
+  const stems = [...new Set((keywords ?? DEFAULT_ADULT_KEYWORDS2).map(stem))].filter((s) => s !== "").sort((a, b) => b.length - a.length || a.localeCompare(b));
+  const key = stems.join("\x00");
+  const hit = cache.get(key);
+  if (hit !== undefined)
+    return hit;
+  const adult = stems.includes(ADULT_STEM);
+  const words = stems.map((s) => s === ADULT_STEM ? "adults?|ad" : `${escape(s).replace(/ /g, "[\\s-]+")}s?`);
+  const one = words.length === 0 ? null : words.join("|");
+  const run = one === null ? null : `(?:${one})(?:[\\s-]+(?:${one}))*`;
+  const out = Object.freeze({ adult, one, run });
+  cache.set(key, out);
+  return out;
+}
+
 var LEAD_ID = /^\s*(?:comp(?:etition)?\.?\s*)?\d+[a-z]*(?:[/-]\d*[a-z]*)*\s*[-:.]?\s*/i;
 var PAREN = /\(([^)]*)\)/g;
 var AND_OVER = /(?<![0-9])(?<![0-9][a-z]*)(?<!(?:^|[^a-z0-9])[a-z])(\d{1,2})\s*(?:years?\s*)?(?:&|\+|\band\b)\s*(?:over|older|up|o)(?![a-z])/i;
@@ -27,7 +50,21 @@ var RANGE = new RegExp(String.raw`(?<![0-9])(?<![0-9][a-z]*)(?<!(?:^|[^a-z0-9])[
 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 printsAdultCode2 = (phrase) => ADULT_CODE.test(phrase);
-var ADULT = /(?<!non[\s-])(?<!-)\b(?:adults?|advanced\s+adults?|masters?)\b/i;
+var adultTitleCache = new Map;
+function adultTitleWords(keywords) {
+  const p = adultPatterns(keywords);
+  const key = `${p.adult}\x00${p.one ?? ""}`;
+  const hit = adultTitleCache.get(key);
+  if (hit !== undefined)
+    return hit;
+  const one = p.one === null ? null : p.adult ? `advanced\\s+adults?|${p.one}` : p.one;
+  const out = Object.freeze({
+    word: one === null ? null : new RegExp(`(?<!non[\\s-])(?<!-)\\b(?:${one})\\b`, "i"),
+    code: p.adult
+  });
+  adultTitleCache.set(key, out);
+  return out;
+}
 var SENIOR = /(?<!-)\bseniors?\b/i;
 var TITLE_RANGE_MIN2 = 3;
 var TITLE_RANGE_MAX2 = 40;
@@ -59,7 +96,7 @@ function readJoined(title, s, offset) {
     return NONE;
   return at(title, offset, j.index, end, `u${Math.max(...caps)}`);
 }
-function readAnchored(title, s, offset, aside = false) {
+function readAnchored(title, s, offset, adultWord, aside = false) {
   const joined = readJoined(title, s, offset);
   if (joined !== null)
     return joined;
@@ -106,7 +143,7 @@ function readAnchored(title, s, offset, aside = false) {
   const p = OVER_PLUS.exec(s);
   if (p?.[1] !== undefined)
     return at(title, offset, p.index, p.index + p[0].length, `o${Number(p[1])}`);
-  const a = ADULT.exec(s);
+  const a = adultWord?.exec(s) ?? null;
   if (a !== null)
     return at(title, offset, a.index, a.index + a[0].length, "adult");
   const n = SENIOR.exec(s);
@@ -114,7 +151,8 @@ function readAnchored(title, s, offset, aside = false) {
     return at(title, offset, n.index, n.index + n[0].length, "senior");
   return NONE;
 }
-function ageTitleToken2(title) {
+function ageTitleToken2(title, options = {}) {
+  const aw = adultTitleWords(options.adultKeywords);
   const s = title.trim();
   if (s === "")
     return NONE;
@@ -127,7 +165,7 @@ function ageTitleToken2(title) {
     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] ?? "");
-    const code = tail ? ADULT_CODE.exec(inner) : null;
+    const code = tail && aw.code ? 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;
@@ -136,19 +174,19 @@ function ageTitleToken2(title) {
     }
     if (adultWord !== null)
       continue;
-    const t = readAnchored(title, inner, from, true);
+    const t = readAnchored(title, inner, from, aw.word, true);
     if (t.token === "")
       continue;
     if (t.token === "adult") {
       adultWord = t;
       continue;
     }
-    return adultOverUnder(title, s, lead, t);
+    return adultOverUnder(title, s, lead, t, aw.word);
   }
   if (adultWord !== null)
     return adultAside ?? adultWord;
-  const words = readAnchored(title, s, lead);
-  return adultAside !== null && (words.token === "" || words.token === "adult") ? adultAside : adultOverUnder(title, s, lead, words);
+  const words = readAnchored(title, s, lead, aw.word);
+  return adultAside !== null && (words.token === "" || words.token === "adult") ? adultAside : adultOverUnder(title, s, lead, words, aw.word);
 }
 var ADULT_UNDER_MIN = 18;
 var SENIOR_ADULT_OVER = /\bsenior\s+adult\b/i;
@@ -172,10 +210,10 @@ function adultBeside2(band) {
     return band;
   return Number(floor) < ADULT_UNDER_MIN ? undefined : `adult ${b}`;
 }
-function adultOverUnder(title, s, lead, t) {
+function adultOverUnder(title, s, lead, t, adultWord) {
   if (t.token === "")
     return t;
-  const a = ADULT.exec(s);
+  const a = adultWord?.exec(s) ?? null;
   if (a === null)
     return t;
   if (/^o\d+$/.test(t.token) && SENIOR_ADULT_OVER.test(s))
@@ -206,9 +244,31 @@ var UNDER2 = /^(?:u|under\s*)(\d+)(?:\/([1-9]\d*)yr)?$/i;
 var OVER = /^(?:o|over\s*)(\d+)$/i;
 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+)(?:\/([1-9]\d*)yr)?$/i;
-var ADULT_BAND = /^(?:adults?|ad)[\s-]+(\S.*)$/i;
+var LEVEL_WORDS = "first[\\s-]*feis|(?:advanced[\\s-]+)?beginners?(?:[\\s-]*(?:1|2|i|ii))?|novice|prizewinners?|intermediate|advanced|open|prelim(?:inary)?|champions?(?:hip)?s?|champs?";
+var NO_ADULT_WORDS = Object.freeze({
+  word: null,
+  level: null,
+  under: null,
+  band: null
+});
+var adultWordsCache = new Map;
+function adultWordsOf(keywords) {
+  const p = adultPatterns(keywords);
+  if (p.run === null)
+    return NO_ADULT_WORDS;
+  const hit = adultWordsCache.get(p.run);
+  if (hit !== undefined)
+    return hit;
+  const run = p.run;
+  const out = Object.freeze({
+    word: new RegExp(`^(?:${run}${p.adult ? "|advanced" : ""})$`, "i"),
+    level: new RegExp(`^(?:(?:${LEVEL_WORDS})[\\s-]+(?:${run})|(?:${run})[\\s-]+(?:${LEVEL_WORDS}))$`, "i"),
+    under: new RegExp(`^(?:${run})[\\s-]*(?:u|under\\s*)(\\d+)(?:\\/([1-9]\\d*)yr)?$`, "i"),
+    band: new RegExp(`^(?:${run})[\\s-]+(\\S.*)$`, "i")
+  });
+  adultWordsCache.set(p.run, out);
+  return out;
+}
 var SENIOR_WORD = /^seniors?$/i;
 var NO_LADDER = Object.freeze({ caps: [], overs: [], ranges: [] });
 function maxWhere(xs, pred) {
@@ -270,11 +330,11 @@ function strideOf(k) {
   const n = Number(k);
   return Number.isInteger(n) && n >= 1 ? n : null;
 }
-function read(token, ladder, top) {
+function read(token, ladder, top, aw) {
   const r = RANGE2.exec(token);
   if (r !== null)
     return readRange(Number(r[1]), Number(r[2]), ladder);
-  const au = ADULT_UNDER.exec(token);
+  const au = aw.under?.exec(token) ?? null;
   if (au !== null && Number(au[1]) > ADULT_FLOOR2) {
     const k = strideOf(au[2]);
     const hi = Number(au[1]);
@@ -286,13 +346,13 @@ function read(token, ladder, top) {
       parts: k === null ? [hi] : [hi, k]
     };
   }
-  const ab = au === null ? ADULT_BAND.exec(token) : null;
+  const ab = au === null ? aw.band?.exec(token) ?? null : null;
   if (ab !== null) {
-    const inner = read(ab[1].trim(), { ...ladder, adult: true }, top);
+    const inner = read(ab[1].trim(), { ...ladder, adult: true }, top, aw);
     if (inner.kind === "over" || inner.kind === "range")
       return { ...inner, clauses: [...inner.clauses, "adult-band"], adult: true };
   }
-  if (au !== null || ADULT_WORD.test(token))
+  if (au !== null || aw.word?.test(token) === true || aw.level?.test(token) === true)
     return {
       kind: "adult",
       interval: { lo: ADULT_FLOOR2, hi: Number.POSITIVE_INFINITY },
@@ -394,7 +454,7 @@ function fromPrint(print, context = {}) {
   const ladder = context.ladder ?? NO_LADDER;
   const year = context.year === undefined ? currentYear() : context.year;
   const ag1 = print.trim().toLowerCase();
-  const reading = ag1 === "" ? { kind: null, interval: null, refusal: null, clauses: [], parts: [] } : refuseAboveOldest(refuseBelowYoungest(read(print.trim(), ladder, context.top === true)));
+  const reading = ag1 === "" ? { kind: null, interval: null, refusal: null, clauses: [], parts: [] } : refuseAboveOldest(refuseBelowYoungest(read(print.trim(), ladder, context.top === true, adultWordsOf(context.adultKeywords))));
   const iv = reading.interval;
   const arm = ag1 === "" ? "empty" : iv === null ? "open" : "band";
   const ag2 = iv !== null ? display(iv) : ag1 === "" ? "" : `${ag1}?`;
@@ -475,9 +535,11 @@ function fromYOB(from, to = from, context = {}) {
   });
 }
 function fromTitle(title, context = {}) {
-  const t = ageTitleToken2(title);
-  return Object.freeze({ age: fromPrint(t.token, context), token: t.token, span: t.span });
+  const t = ageTitleToken2(title, { adultKeywords: context.adultKeywords });
+  const age = fromPrint(t.token, { ...context, adultKeywords: TOKEN_ADULT_KEYWORDS });
+  return Object.freeze({ age, token: t.token, span: t.span });
 }
+var TOKEN_ADULT_KEYWORDS = Object.freeze(["adult"]);
 var Age2 = Object.freeze({ from: fromPrint, fromYOB, fromTitle });
 function sourceOf(r) {
   const iv = r.interval;
@@ -669,4 +731,4 @@ function youngFloor2(year, oldest) {
 var tooYoungForMajor2 = (year, oldest) => yearsSinceBirth2(year, oldest) < MIN_MAJOR_AGE2;
 var tooYoungForFeis2 = (year, oldest) => yearsSinceBirth2(year, oldest) < MIN_FEIS_AGE2;
 
-export { printsUnderOpen2, printsAdultCode2, TITLE_RANGE_MIN2, TITLE_RANGE_MAX2, ageTitleToken2, readsSeniorAdult2, adultBeside2, YOUNGEST_FLOOR2, ADULT_FLOOR2, MAJORS_FLOOR_YEARS2, UNDER_CAP2, UNDER_CAP_MAX_TOP2, YOUNG_FLOOR2, MIN_MAJOR_AGE2, MIN_FEIS_AGE2, YOUNGEST_BAND_TOP2, OLDEST_BAND_FLOOR2, YOB_RANGE2, DANCE_UP_YEARS2, ageOnJanuary12, yearsSinceBirth2, AgeMisuseError2, Age2, birthYearsOfInterval2, ageRelation2, canOverlap2, AVERAGE_AGE_DECIMALS2, roundedMeanHundredths2, isAveraged2, averageAge2, birthYearsDisjoint2, intersectBirthYears2, birthYearsMeet2, underCapApplies2, underCappedYears2, underCapRefuses2, validYOB2, youngFloor2, tooYoungForMajor2, tooYoungForFeis2 };
+export { DEFAULT_ADULT_KEYWORDS2, printsUnderOpen2, printsAdultCode2, TITLE_RANGE_MIN2, TITLE_RANGE_MAX2, ageTitleToken2, readsSeniorAdult2, adultBeside2, YOUNGEST_FLOOR2, ADULT_FLOOR2, MAJORS_FLOOR_YEARS2, UNDER_CAP2, UNDER_CAP_MAX_TOP2, YOUNG_FLOOR2, MIN_MAJOR_AGE2, MIN_FEIS_AGE2, YOUNGEST_BAND_TOP2, OLDEST_BAND_FLOOR2, YOB_RANGE2, DANCE_UP_YEARS2, ageOnJanuary12, yearsSinceBirth2, AgeMisuseError2, Age2, birthYearsOfInterval2, ageRelation2, canOverlap2, AVERAGE_AGE_DECIMALS2, roundedMeanHundredths2, isAveraged2, averageAge2, birthYearsDisjoint2, intersectBirthYears2, birthYearsMeet2, underCapApplies2, underCappedYears2, underCapRefuses2, validYOB2, youngFloor2, tooYoungForMajor2, tooYoungForFeis2 };

package/dist/code.js

@@ -1,10 +1,10 @@
 import {
   Age2
-} from "./chunks/place-kmh59zkw.js";
+} from "./chunks/place-w6d4xfzc.js";
 import {
   populationIn2,
   compTitle2
-} from "./chunks/place-7jfd4m3j.js";
+} from "./chunks/place-dn6qk21g.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";

package/dist/dance-types.js

@@ -1,14 +1,18 @@
 import {
   DANCE_TYPES2,
+  GRADE_DANCES2,
+  isGradeDance2,
   rhythmOfTime2,
   danceTypes2,
   danceTypePrints2,
   isDanceTypePrint2
-} from "./chunks/place-ng98cts4.js";
+} from "./chunks/place-3pgn1jgx.js";
 export {
   DANCE_TYPES2 as DANCE_TYPES,
+  GRADE_DANCES2 as GRADE_DANCES,
   danceTypePrints2 as danceTypePrints,
   danceTypes2 as danceTypes,
   isDanceTypePrint2 as isDanceTypePrint,
+  isGradeDance2 as isGradeDance,
   rhythmOfTime2 as rhythmOfTime
 };

package/dist/dance.js

@@ -1,10 +1,10 @@
-import"./chunks/place-ng98cts4.js";
+import"./chunks/place-3pgn1jgx.js";
 import {
   ceili2
-} from "./chunks/place-gd57gavk.js";
+} from "./chunks/place-3xxgddqw.js";
 import {
   tune2
-} from "./chunks/place-tpj00cfp.js";
+} from "./chunks/place-4gycgaw0.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";

package/dist/schedule.js

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

package/dist/title.js

@@ -9,8 +9,8 @@ import {
   titleRelation2,
   ladderOf2,
   matchTitle2
-} from "./chunks/place-7jfd4m3j.js";
-import"./chunks/place-kmh59zkw.js";
+} from "./chunks/place-dn6qk21g.js";
+import"./chunks/place-w6d4xfzc.js";
 export {
   codePopulation2 as codePopulation,
   compTitle2 as compTitle,

package/dist/tune.js

@@ -8,8 +8,8 @@ import {
   settingAt2,
   tune2,
   tuneRelation2
-} from "./chunks/place-tpj00cfp.js";
-import"./chunks/place-ng98cts4.js";
+} from "./chunks/place-4gycgaw0.js";
+import"./chunks/place-3pgn1jgx.js";
 export {
   PLAUSIBLE_SET_TEMPO_MAX2 as PLAUSIBLE_SET_TEMPO_MAX,
   SET_MIN_SPEED2 as SET_MIN_SPEED,

package/dist/types/adult-keywords.d.ts

@@ -0,0 +1,7 @@
+export declare const DEFAULT_ADULT_KEYWORDS: readonly string[];
+export interface AdultPatterns {
+    readonly adult: boolean;
+    readonly one: string | null;
+    readonly run: string | null;
+}
+export declare function adultPatterns(keywords: readonly string[] | undefined): AdultPatterns;

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

@@ -1,5 +1,8 @@
 export declare const printsUnderOpen: (print: string) => boolean;
 export declare const printsAdultCode: (phrase: string) => boolean;
+export interface AgeTitleOptions {
+    readonly adultKeywords?: readonly string[];
+}
 export declare const TITLE_RANGE_MIN = 3;
 export declare const TITLE_RANGE_MAX = 40;
 export interface AgeTitleSpan {
@@ -11,6 +14,6 @@ export interface AgeTitleToken {
     readonly token: string;
     readonly span: AgeTitleSpan | null;
 }
-export declare function ageTitleToken(title: string): AgeTitleToken;
+export declare function ageTitleToken(title: string, options?: AgeTitleOptions): AgeTitleToken;
 export declare function readsSeniorAdult(title: string, span: AgeTitleSpan): boolean;
 export declare function adultBeside(band: string): string | undefined;

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

@@ -20,6 +20,7 @@ export interface AgeContext {
     readonly ladder?: AgeLadder;
     readonly year?: number | null;
     readonly top?: boolean;
+    readonly adultKeywords?: readonly string[];
 }
 export type AgeArm = "band" | "yob" | "open" | "empty";
 export type AgeKind = "under" | "over" | "range" | "adult" | "senior" | "yob";

package/dist/types/age.d.ts

@@ -1,7 +1,8 @@
 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, adultBeside, ageTitleToken, printsAdultCode, printsUnderOpen, readsSeniorAdult, } from "./age-title.ts";
+export { DEFAULT_ADULT_KEYWORDS } from "./adult-keywords.ts";
+export { type AgeTitleOptions, type AgeTitleSpan, type AgeTitleToken, TITLE_RANGE_MAX, TITLE_RANGE_MIN, adultBeside, ageTitleToken, printsAdultCode, printsUnderOpen, readsSeniorAdult, } 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/dist/types/dance-types.d.ts

@@ -1,6 +1,9 @@
 export type { DanceMatch, DanceRelation } from "./dance-match.ts";
 export type DanceType = "reel" | "light-jig" | "single-jig" | "slip-jig" | "treble-jig" | "hornpipe" | "traditional-set" | "set-dance";
 export declare const DANCE_TYPES: readonly DanceType[];
+export type GradeDance = Exclude<DanceType, "traditional-set" | "set-dance">;
+export declare const GRADE_DANCES: readonly GradeDance[];
+export declare function isGradeDance(d: string | null | undefined): d is GradeDance;
 export type TimeSignature = "2/4" | "4/4" | "6/8" | "9/8" | "6/8+9/8";
 export type SetRhythm = "jig" | "hornpipe";
 export declare function rhythmOfTime(time: TimeSignature): SetRhythm;

package/dist/types/title.d.ts

@@ -12,6 +12,7 @@ export declare function roundFold(print: string): string;
 export interface TitleContext {
     readonly year?: number | null;
     readonly ladder?: AgeLadder;
+    readonly adultKeywords?: readonly string[];
 }
 export type TitleRefusal = "no-age";
 export interface CompTitle extends Validated<TitleRefusal> {

package/package.json

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