@finbheara/domain 0.6.2 → 0.8.0

package/README.md

@@ -265,12 +265,25 @@ Age.fromTitle("Junior Boys 12 Years").token;            // "u13"
 Age.fromTitle("10-11 Single Jig").token;                // "10-11", a band, not a number
 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": a split of the adult band
+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;   // "o19": senior or adult is not settled
 ```
 
-An adult word beside an `Under N` at 18 or above reads `adult`: Adult is a band with an 18
-floor, and the `Under 40` splits it. Below 18 the youth band stands.
+An adult word beside an `Under N` above 18 reads both: `adult u40` is adult (`isAdult()`), with
+the adult floor of 18 and a ceiling of 40, so `Age.from("adult u40", { year: 2026 })` is born
+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 rung beside the word (`Senior Adult Ladies 19 & Over`) reads the band
+alone.
 
 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

@@ -99,12 +99,22 @@ function ageTitleToken(title) {
   return words.token === "" && adultAside !== null ? adultAside : adultOverUnder(title, s, lead, words);
 }
 var ADULT_UNDER_MIN = 18;
+var SENIOR_ADULT = /\bseniors?\s+adults?\b/i;
 function adultOverUnder(title, s, lead, t) {
+  const a = ADULT.exec(s);
+  if (a === null)
+    return t;
   const n = /^u(\d+)$/.exec(t.token)?.[1];
-  if (n === undefined || Number(n) < ADULT_UNDER_MIN)
+  if (n !== undefined) {
+    if (Number(n) < ADULT_UNDER_MIN)
+      return t;
+    const token = Number(n) > ADULT_UNDER_MIN ? `adult u${n}` : "adult";
+    return at(title, lead, a.index, a.index + a[0].length, token);
+  }
+  const floor = /^o(\d+)$/.exec(t.token)?.[1] ?? /^(\d+)-\d+$/.exec(t.token)?.[1];
+  if (floor === undefined || Number(floor) < ADULT_UNDER_MIN || SENIOR_ADULT.test(s))
     return t;
-  const a = ADULT.exec(s);
-  return a === null ? t : at(title, lead, a.index, a.index + a[0].length, "adult");
+  return { token: `adult ${t.token}`, span: t.span };
 }
 
 var YOUNGEST_FLOOR = 0;
@@ -125,6 +135,8 @@ 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+)$/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) {
@@ -182,7 +194,22 @@ function read(token, ladder, top) {
   const r = RANGE2.exec(token);
   if (r !== null)
     return readRange(Number(r[1]), Number(r[2]), ladder);
-  if (ADULT_WORD.test(token))
+  const au = ADULT_UNDER.exec(token);
+  if (au !== null && Number(au[1]) > ADULT_FLOOR)
+    return {
+      kind: "adult",
+      interval: { lo: ADULT_FLOOR, hi: Number(au[1]) },
+      refusal: null,
+      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",
       interval: { lo: ADULT_FLOOR, hi: Number.POSITIVE_INFINITY },
@@ -299,7 +326,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;

package/dist/school.js

@@ -1019,6 +1019,13 @@ function createSchoolNameReader(options = {}) {
   const CP1252_HIGH = "€‚ƒ„…†‡ˆ‰Š‹Œ" + "Ž‘’“”•–—˜™š›" + "œžŸ";
   const BYTE_OF_CP1252 = new Map([...CP1252_HIGH].map((ch, i) => [ch.codePointAt(0), 128 + i]));
   const MOJIBAKE = /[Â-ßà-ï][€-¿‚-›ŒŠŽ]/u;
+  const MOJIBAKE_ALL = new RegExp(MOJIBAKE.source, "gu");
+  const NON_LATIN_LETTER = /(?!\p{Script=Latin})\p{L}/u;
+  function isRepair(before, after) {
+    if (!NON_LATIN_LETTER.test(after))
+      return true;
+    return (before.match(MOJIBAKE_ALL)?.length ?? 0) >= 2;
+  }
   function undoMojibake(s) {
     const bytes = new Uint8Array(s.length);
     for (let i = 0;i < s.length; i++) {
@@ -1038,7 +1045,7 @@ function createSchoolNameReader(options = {}) {
     let s = print;
     for (let round = 0;round < 3 && MOJIBAKE.test(s); round++) {
       const undone = undoMojibake(s);
-      if (undone === undefined || undone === s)
+      if (undone === undefined || undone === s || !isRepair(s, undone))
         return s;
       s = undone;
     }

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" | "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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.6.2",
+	"version": "0.8.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"
 	}
 }