@finbheara/domain 0.8.0 → 0.10.0

package/README.md

@@ -269,7 +269,12 @@ Age.fromTitle("Beginner Adults Reel U40").token;        // "adult u40": the adul
 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
+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
@@ -282,8 +287,13 @@ An adult word beside an and-over from 18 or a range from 18 reads both as well:
 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.
+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,40 +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;
-var SENIOR_ADULT = /\bseniors?\s+adults?\b/i;
+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) {
+  if (t.token === "")
+    return t;
   const a = ADULT.exec(s);
   if (a === null)
     return t;
-  const n = /^u(\d+)$/.exec(t.token)?.[1];
-  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))
+  const token = adultBeside(t.token);
+  if (token === undefined || token === t.token)
     return t;
-  return { token: `adult ${t.token}`, span: t.span };
+  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;
@@ -586,6 +609,7 @@ export {
   YOUNGEST_BAND_TOP,
   YOUNGEST_FLOOR,
   YOUNG_FLOOR,
+  adultBeside,
   ageOnJanuary1,
   ageRelation,
   ageTitleToken,

package/dist/chunks/{place-h7tvdfyp.js → place-tv86hmps.js}

@@ -199,14 +199,16 @@ var PLACE_NODES = [
     geo: "USA",
     admin: "IDTANA",
     prints: [
+      "idtama",
       "lar mheiricea",
       "mid america",
       "mid america region",
       "mid america region usa",
+      "mid american region",
       "reigiun lar meiricea",
       "usa mid america region"
     ],
-    codes: ["MAO"],
+    codes: ["IDTAMA", "MAO"],
     truncations: ["mid am"],
     oireachtas: "MAO"
   },
@@ -243,6 +245,7 @@ var PLACE_NODES = [
     geo: "USA",
     admin: "IDTANA",
     prints: [
+      "idtana sr",
       "reigiun an deiscirt",
       "s usa",
       "so usa",
@@ -4994,6 +4997,15 @@ var PLACE_NODES = [
     prints: ["essex"],
     codes: []
   },
+  {
+    id: "GBR-ENG/surrey",
+    kind: "city",
+    name: "Surrey",
+    geo: "GBR-ENG",
+    admin: "ENG_SOUTH",
+    prints: ["surrey"],
+    codes: []
+  },
   {
     id: "GBR-ENG/leeds",
     kind: "city",
@@ -6800,7 +6812,7 @@ function createPlaceReader2(options = {}) {
     return s.normalize("NFD").replace(/\p{M}+/gu, "").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
   }
   function repair(print) {
-    const s = print.normalize("NFC").replace(/\s+/g, " ").trim();
+    const s = print.normalize("NFC").replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(/\s+/g, " ").trim();
     const opens = (s.match(/[([{]/g) ?? []).length;
     const closes = (s.match(/[)\]}]/g) ?? []).length;
     if (opens === closes)
@@ -7407,6 +7419,41 @@ function createPlaceReader2(options = {}) {
     const found = (idx().byRunPrint.get(fold(piece)) ?? []).filter((n) => subs.some((s) => n.id !== s.id && isAncestor(s, n)));
     return found.length === 1 ? found[0] : undefined;
   }
+  function continentOf(n) {
+    const seen = new Set;
+    for (let at = n;at !== undefined && !seen.has(at.id); ) {
+      if (at.kind === "continent")
+        return at;
+      seen.add(at.id);
+      at = at.geo === null ? undefined : idx().byId.get(at.geo);
+    }
+    return;
+  }
+  const POSTAL_COUNTRIES = new Set(["USA", "CAN"]);
+  function qualifierAlone(left, right) {
+    if (left.length === 0 || right.length === 0)
+      return;
+    if (left.some((l) => right.some((r) => relates(l, r))))
+      return;
+    const postal = right.filter((r) => r.kind === "subdivision" && POSTAL_COUNTRIES.has(countryOf(r)?.id ?? ""));
+    if (postal.length > 0) {
+      const theirs = new Set(postal.map((r) => countryOf(r)?.id));
+      const fits = left.every((l) => l.kind === "city" || (l.kind === "country" || l.kind === "subdivision") && !theirs.has(countryOf(l)?.id));
+      return fits ? postal : undefined;
+    }
+    if (!right.every((r) => r.kind === "country" || r.kind === "subdivision"))
+      return;
+    const continents = new Set(right.map((r) => continentOf(r)?.id));
+    if (continents.has(undefined))
+      return;
+    const abroad = left.every((l) => {
+      if (l.kind !== "city")
+        return false;
+      const c = continentOf(l)?.id;
+      return c !== undefined && !continents.has(c);
+    });
+    return abroad ? right : undefined;
+  }
   function read(print, declared = false, smushed = true) {
     const core = unbracket(repair(print));
     if (fold(core) === "")
@@ -7432,6 +7479,7 @@ function createPlaceReader2(options = {}) {
     const seen = new Set;
     for (const split of subsets) {
       const parts = [];
+      const before = [null];
       let space = tokens[0] ?? "";
       let conj = space;
       for (let i = 0;i < seps.length; i++) {
@@ -7439,6 +7487,7 @@ function createPlaceReader2(options = {}) {
         const next = tokens[i + 1] ?? "";
         if (split.includes(k)) {
           parts.push({ space, conj });
+          before.push(k);
           space = next;
           conj = next;
         } else {
@@ -7466,6 +7515,21 @@ function createPlaceReader2(options = {}) {
             refusal: null
           };
       }
+      const qualified = (k) => k === "comma" || k === "space";
+      const settled = reads.map((r, n) => {
+        const prev = reads[n - 1];
+        if (prev === undefined || !qualified(before[n]) || r.truncated)
+          return;
+        if (n - 1 > 0 && (qualified(before[n - 1]) || !qualified(before[n - 2])))
+          return;
+        return qualifierAlone(prev.heads, r.heads);
+      });
+      settled.forEach((heads, n) => {
+        if (heads === undefined)
+          return;
+        reads[n - 1] = { ...reads[n - 1], heads };
+        reads[n] = { ...reads[n], heads };
+      });
       if (reads.some((r) => r.heads.length === 0 || r.refusal !== null))
         continue;
       const together = combine(reads);

package/dist/place.js

@@ -15,7 +15,7 @@ import {
   placesRelation2,
   probablySamePlace2,
   sameReading2
-} from "./chunks/place-h7tvdfyp.js";
+} from "./chunks/place-tv86hmps.js";
 export {
   DEFAULT_PLACE_CAPACITY2 as DEFAULT_PLACE_CAPACITY,
   DEFAULT_PLACE_READER2 as DEFAULT_PLACE_READER,

package/dist/school.js

@@ -8,12 +8,12 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-h7tvdfyp.js";
+} from "./chunks/place-tv86hmps.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";
 
-import { normalizeApostrophes } from "@finbheara/names/lexicon";
+import { normalizeApostrophes as normalizeApostrophes2 } from "@finbheara/names/lexicon";
 import { SURNAME_SEPARATOR, lexiconKey, titleCaseNamePart } from "@finbheara/names/normalize";
 import { personName } from "@finbheara/names/normalize";
 
@@ -873,6 +873,7 @@ function truncatedInstitution(tail) {
   return found;
 }
 
+import { normalizeApostrophes } from "@finbheara/names/lexicon";
 var SCHOOL_FLUFF_WORDS = new Set([
   "academy",
   "irish",
@@ -929,12 +930,11 @@ function isDiscardedAnyway(token) {
 function distinctiveTokens(tokens) {
   return tokens.filter((t) => t.length > 2 && !SCHOOL_FLUFF_WORDS.has(t));
 }
-var APOSTROPHE_VARIANTS = /['`´‘’“”’]/g;
 function foldSchoolName(raw) {
   let s = raw.toLowerCase();
   s = s.normalize("NFD").replace(/[̀-ͯ]/g, "");
   s = s.replace(/ß/g, "ss").replace(/æ/g, "ae").replace(/œ/g, "oe").replace(/ø/g, "o");
-  s = s.replace(APOSTROPHE_VARIANTS, "'");
+  s = normalizeApostrophes(s);
   s = s.replace(/'/g, "");
   const words = [];
   for (const word of s.split(/[^a-z0-9]+/)) {
@@ -1057,7 +1057,7 @@ function createSchoolNameReader(options = {}) {
     return print.replace(SPACING_ACUTE_AFTER_VOWEL, "$1́").replace(SPACING_ACUTE, "'");
   }
   function renderSn1(print) {
-    return normalizeApostrophes(readSpacingAcute(repairMojibake(print)).normalize("NFKC")).replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(/\s+/gu, " ").trim();
+    return normalizeApostrophes2(readSpacingAcute(repairMojibake(print)).normalize("NFKC")).replace(/\p{Cf}+/gu, "").replace(/\p{Cc}+/gu, " ").replace(/\s+/gu, " ").trim();
   }
   const COMPOUND_OPENERS = new Set([
     "hyphen",

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.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.8.0",
+	"version": "0.10.0",
 	"description": "Places, CLRG regions, school names, ages and dances as they are printed: read, compared and told apart",
 	"keywords": [
 		"places",