@finbheara/domain 0.13.1 → 0.19.0

package/README.md

@@ -262,6 +262,7 @@ Age.fromTitle("Open Championship 15-16", { year: 2026 }).token;          // "15-
 Age.fromTitle("Competition 719OC - Open Championship (O18)").token;     // "o18", not "o9"
 Age.fromTitle("Treble Reel Special", { year: 2026 }).age.isEmpty();     // true
 Age.fromTitle("Mixed Reel 7 & Under").token;            // "u8": a 7-year-old dances in it
+Age.fromTitle("Mixed Reel Under 08 / 2 yr").token;      // "u8/2yr": the two ages under 8
 Age.fromTitle("Girls 8 and under 9 years").token;       // "8-9"
 Age.fromTitle("Junior Boys 12 Years").token;            // "u13"
 Age.fromTitle("10-11 Single Jig").token;                // "10-11", a band, not a number
@@ -271,7 +272,7 @@ 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;   // "adult o19": "Senior Adult" is adult
+Age.fromTitle("Senior Adult Ladies 19 & Over").token;   // "o19": TIDA's oldest youth championship
 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"
@@ -288,10 +289,10 @@ An adult word beside an and-over from 18 or a range from 18 reads both as well:
 `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`.
+18 or a range opening under 18 (`Teen & Adult 13 & Over`) admits youth, and the band stands. TIDA's
+`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`.
 
 `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
@@ -300,6 +301,12 @@ 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.
 
+An under band may print its stride, the number of ages it holds: `Under 08 / 2 yr` is the ages 6
+and 7, and reads `u8/2yr`. `Age.from("u8/2yr")` is `[6, 8)` whatever the ladder offers, since the
+page states the floor (`clauses` is `["under-stride"]`), where a plain `u8` takes the rung below
+it. So `Age.from("u8/2yr", { year: 2026 })` is born 2018 or 2019. Beside the adult word the stride
+never opens below 18: `adult u40/10yr` is `[30, 40)`.
+
 A value the reader cannot stand behind is returned, not thrown. An `Age` is `Validated` (above):
 an age group under `U3` admits nobody old enough to dance, and a year of birth outside 1901 to
 2099 is not one, so the placeholders `1000` and `1900` are refused. An invalid `Age` has no

package/dist/age.js

@@ -4,14 +4,17 @@ import {
 
 var LEAD_ID = /^\s*(?:comp(?:etition)?\.?\s*)?\d+[a-z]*(?:[/-]\d*[a-z]*)*\s*[-:.]?\s*/i;
 var PAREN = /\(([^)]*)\)/g;
-var AND_OVER = /(?<![a-z0-9])(\d{1,2})\s*(?:years?\s*)?(?:&|\+|\band\b)\s*(?:over|older|up|o)(?![a-z])/i;
-var OVER_WORD = /(?:\bover\s*|\bos\s+cionn\s*|(?<![a-z0-9])o\.?\s*)(\d{1,2})(?![a-z0-9])/i;
+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;
+var OVER_WORD = /(?:\bover\s*|\bos\s+cionn\s*|(?<![a-z0-9])o[./]?\s*)(\d{1,2})(?![a-z0-9])/i;
 var OVER_GLUED = /(?<![a-z0-9])(\d{1,2})\s*o(?![a-z'’])/i;
 var OVER_PLUS = /(?<![a-z0-9])(\d{1,2})\s*\+/;
-var UNDER = /(?:\bunder\s*|\bfaoi\s*|(?<![a-z0-9])u\.?\s*)(\d{1,2})(?![a-z0-9])/i;
+var UNDER = /(?:\bunder\s*(?:age\s*)?|\bfaoi\s*|(?<![a-z0-9])u\.?\s*)(\d{1,2})(?![0-9])(?![a-z][a-z0-9])/i;
+var UNDER_STRIDE = /^\s*\/\s*0*([1-9]\d?)\s*yrs?(?![a-z0-9])/i;
 var AND_UNDER = /(?<![a-z0-9])(\d{1,2})\s*(?:years?\s*)?(?:&|\/|\band\b)\s*u(?:nder)?(?![a-z])(?!\s*\d)/i;
 var AND_UNDER_RANGE = /(?<![a-z0-9])(\d{1,2})\s*(?:&|\band\b)\s*under\s*(\d{1,2})(?![a-z0-9])/i;
 var AND_RANGE = /(?<![a-z0-9])(?<!\b(?:under|und|over|faoi|cionn|u|o)\.?\s*)(?<!\d\s*,\s*)(?<!\(\s*)(\d{1,2})\s*(?:&|\band\b)\s*(\d{1,2})(?![a-z0-9])(?!\s*-?\s*hand)(?!\s*(?:&|\+|\/|,|\)|\band\b|\bor\b))/i;
+var SLASH_RANGE = /(?<![a-z0-9/])(\d{1,2})\s*\/\s*(\d{1,2})(?=\s*(?:years?|yrs?|boys?|girls?|ladies|men)\b)/i;
+var AGE_N = /(?<!\b(?:under|over)\s*)\bage\s*(\d{1,2})(?![a-z0-9])(?!\s*-?\s*hand)/i;
 var YEARS = /(?<![a-z0-9])(?<!\d\s*(?:&|\/|\band\b|[-\u0096–—]|\bto\b)\s*)(\d{1,2})\s*(?:years?|yrs?)(?![a-z0-9])(?!\s*(?:&|\+|\/|\band\b|\bor\b|old))/i;
 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");
@@ -28,6 +31,8 @@ function at(title, offset, start, end, token) {
   return { token, span: { start: a, end: b, text: title.slice(a, b) } };
 }
 function inFence(a, b) {
+  if (a.startsWith("0") || b.startsWith("0"))
+    return false;
   const lo = Number(a);
   const hi = Number(b);
   return lo >= TITLE_RANGE_MIN && hi <= TITLE_RANGE_MAX && lo < hi;
@@ -44,6 +49,9 @@ function readAnchored(title, s, offset, aside = false) {
   const j = aside ? null : AND_RANGE.exec(s);
   if (j?.[1] !== undefined && j[2] !== undefined && inFence(j[1], j[2]))
     return at(title, offset, j.index, j.index + j[0].length, `${Number(j[1])}-${Number(j[2])}`);
+  const sl = aside ? null : SLASH_RANGE.exec(s);
+  if (sl?.[1] !== undefined && sl[2] !== undefined && inFence(sl[1], sl[2]) && Number(sl[2]) === Number(sl[1]) + 1)
+    return at(title, offset, sl.index, sl.index + sl[0].length, `${Number(sl[1])}-${Number(sl[2])}`);
   const l = LEAD_RANGE.exec(s);
   if (l?.[1] !== undefined && l[2] !== undefined && inFence(l[1], l[2])) {
     const lead = l[0].length - l[0].trimStart().length;
@@ -58,9 +66,14 @@ function readAnchored(title, s, offset, aside = false) {
   if (au?.[1] !== undefined)
     return at(title, offset, au.index, au.index + au[0].length, `u${Number(au[1]) + 1}`);
   const m = UNDER.exec(s);
-  if (m?.[1] !== undefined)
-    return at(title, offset, m.index, m.index + m[0].length, `u${Number(m[1])}`);
-  const y = YEARS.exec(s);
+  if (m?.[1] !== undefined) {
+    const end = m.index + m[0].length;
+    const k = UNDER_STRIDE.exec(s.slice(end));
+    if (k?.[1] !== undefined)
+      return at(title, offset, m.index, end + k[0].length, `u${Number(m[1])}/${Number(k[1])}yr`);
+    return at(title, offset, m.index, end, `u${Number(m[1])}`);
+  }
+  const y = YEARS.exec(s) ?? AGE_N.exec(s);
   if (y?.[1] !== undefined)
     return at(title, offset, y.index, y.index + y[0].length, `u${Number(y[1]) + 1}`);
   const p = OVER_PLUS.exec(s);
@@ -111,15 +124,17 @@ function ageTitleToken(title) {
   return adultAside !== null && (words.token === "" || words.token === "adult") ? adultAside : adultOverUnder(title, s, lead, words);
 }
 var ADULT_UNDER_MIN = 18;
+var SENIOR_ADULT_OVER = /\bsenior\s+adult\b/i;
 function adultBeside(band) {
   const b = band.trim().toLowerCase();
   if (b === "")
     return "adult";
-  const n = /^u(\d+)$/.exec(b)?.[1];
+  const u = /^u(\d+)(\/\d+yr)?$/.exec(b);
+  const n = u?.[1];
   if (n !== undefined) {
     if (Number(n) < ADULT_UNDER_MIN)
       return;
-    return Number(n) > ADULT_UNDER_MIN ? `adult u${Number(n)}` : "adult";
+    return Number(n) > ADULT_UNDER_MIN ? `adult u${Number(n)}${u?.[2] ?? ""}` : "adult";
   }
   const floor = /^o(\d+)$/.exec(b)?.[1] ?? /^(\d+)-\d+$/.exec(b)?.[1];
   if (floor === undefined)
@@ -132,10 +147,12 @@ function adultOverUnder(title, s, lead, t) {
   const a = ADULT.exec(s);
   if (a === null)
     return t;
+  if (/^o\d+$/.test(t.token) && SENIOR_ADULT_OVER.test(s))
+    return t;
   const token = adultBeside(t.token);
   if (token === undefined || token === t.token)
     return t;
-  if (/^u\d+$/.test(t.token))
+  if (/^u\d+(?:\/\d+yr)?$/.test(t.token))
     return at(title, lead, a.index, a.index + a[0].length, token);
   return { token, span: t.span };
 }
@@ -153,12 +170,12 @@ var YOB_RANGE = Object.freeze({ first: 1901, last: 2099 });
 var DANCE_UP_YEARS = 1;
 var ageOnJanuary1 = (year, born) => year - born - 1;
 var yearsSinceBirth = (year, born) => year - born;
-var UNDER2 = /^(?:u|under\s*)(\d+)$/i;
+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+)$/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 SENIOR_WORD = /^seniors?$/i;
 var NO_LADDER = Object.freeze({ caps: [], overs: [], ranges: [] });
@@ -213,19 +230,28 @@ function readRange(a, b, ladder) {
     parts: [a, b]
   };
 }
+function strideOf(k) {
+  if (k === undefined)
+    return null;
+  const n = Number(k);
+  return Number.isInteger(n) && n >= 1 ? n : null;
+}
 function read(token, ladder, top) {
   const r = RANGE2.exec(token);
   if (r !== null)
     return readRange(Number(r[1]), Number(r[2]), ladder);
   const au = ADULT_UNDER.exec(token);
-  if (au !== null && Number(au[1]) > ADULT_FLOOR)
+  if (au !== null && Number(au[1]) > ADULT_FLOOR) {
+    const k = strideOf(au[2]);
+    const hi = Number(au[1]);
     return {
       kind: "adult",
-      interval: { lo: ADULT_FLOOR, hi: Number(au[1]) },
+      interval: { lo: k === null ? ADULT_FLOOR : Math.max(ADULT_FLOOR, hi - k), hi },
       refusal: null,
-      clauses: ["adult-under-ceiling"],
-      parts: [Number(au[1])]
+      clauses: k === null ? ["adult-under-ceiling"] : ["adult-under-ceiling", "under-stride"],
+      parts: k === null ? [hi] : [hi, k]
     };
+  }
   const ab = au === null ? ADULT_BAND.exec(token) : null;
   if (ab !== null) {
     const inner = read(ab[1].trim(), { ...ladder, adult: true }, top);
@@ -253,6 +279,15 @@ function read(token, ladder, top) {
   const u = UNDER2.exec(token);
   if (u !== null) {
     const n = Number(u[1]);
+    const k = strideOf(u[2]);
+    if (k !== null)
+      return {
+        kind: "under",
+        interval: { lo: Math.max(YOUNGEST_FLOOR, n - k), hi: n },
+        refusal: null,
+        clauses: ["under-stride"],
+        parts: [n, k]
+      };
     const below = maxWhere(ladder.caps, (c) => c < n);
     return {
       kind: "under",
@@ -357,7 +392,7 @@ function fromPrint(print, context = {}) {
         throw new Error(`Age.from(${JSON.stringify(print)}): birthYears needs a competition year`);
       return birthYearsOfInterval(iv, at);
     },
-    floorObserved: () => reading.kind !== "under" && reading.kind !== "range" || iv === null ? null : reading.clauses.includes("under-floored-on-rung") || reading.clauses.includes("range-adult-floor")
+    floorObserved: () => reading.kind !== "under" && reading.kind !== "range" || iv === null ? null : reading.clauses.includes("under-floored-on-rung") || reading.clauses.includes("range-adult-floor") || reading.clauses.includes("under-stride")
   });
 }
 function fromYOB(from, to = from, context = {}) {
@@ -412,6 +447,8 @@ function sourceOf(r) {
   switch (r.kind) {
     case "range":
     case "under":
+      if (r.clauses.includes("under-stride"))
+        return "printed-band";
       return iv.lo > YOUNGEST_FLOOR ? "sibling-narrowed" : "printed-band";
     case "over":
       return iv.hi === Number.POSITIVE_INFINITY ? "printed-band" : "sibling-narrowed";

package/dist/chunks/{place-sa6438qr.js → place-39zj2ymq.js}

@@ -95,7 +95,7 @@ var PLACE_NODES = [
     name: "Cúige Chonnacht / Connacht",
     geo: "IRL",
     admin: "world",
-    prints: ["chonnacht", "connacht", "connaght", "connaught", "cuige chonnacht"],
+    prints: ["chonnacht", "connacht", "connaght", "connaught", "cuige chonnacht", "cuige connacht"],
     codes: ["CONNACHT"],
     oireachtas: "CONNACHT"
   },
@@ -381,7 +381,7 @@ var PLACE_NODES = [
     name: "Cúige Uladh / Ulster",
     geo: "IRL",
     admin: "world",
-    prints: ["cuige uladh", "cuige uldah", "uladh", "ulster"],
+    prints: ["cuige uladh", "cuige uldah", "cuige ulster", "uladh", "ulster"],
     codes: ["ULSTER"],
     oireachtas: "ULSTER"
   },
@@ -3575,6 +3575,276 @@ var PLACE_NODES = [
     prints: ["warwickshire"],
     codes: ["GB-WAR", "GBR-WAR"]
   },
+  {
+    id: "GBR-BDF",
+    kind: "subdivision",
+    name: "Bedfordshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["bedfordshire"],
+    codes: ["GB-BDF", "GBR-BDF"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-BKM",
+    kind: "subdivision",
+    name: "Buckinghamshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["buckinghamshire"],
+    codes: ["GB-BKM", "GBR-BKM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-BRK",
+    kind: "subdivision",
+    name: "Berkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["berkshire"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-CAM",
+    kind: "subdivision",
+    name: "Cambridgeshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["cambridgeshire"],
+    codes: ["GB-CAM", "GBR-CAM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-DUR",
+    kind: "subdivision",
+    name: "County Durham",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["co durham", "county durham", "durham"],
+    codes: ["GB-DUR", "GBR-DUR"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-ERY",
+    kind: "subdivision",
+    name: "East Riding of Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["east riding", "east riding of yorkshire", "east riding yorkshire"],
+    codes: ["GB-ERY", "GBR-ERY"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-ESX",
+    kind: "subdivision",
+    name: "East Sussex",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["east sussex"],
+    codes: ["GB-ESX", "GBR-ESX"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-GTL",
+    kind: "subdivision",
+    name: "Greater London",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["greater london"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-GTM",
+    kind: "subdivision",
+    name: "Greater Manchester",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["greater manchester"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-HAM",
+    kind: "subdivision",
+    name: "Hampshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["hampshire"],
+    codes: ["GB-HAM", "GBR-HAM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-IOW",
+    kind: "subdivision",
+    name: "Isle of Wight",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["isle of wight"],
+    codes: ["GB-IOW", "GBR-IOW"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-KEN",
+    kind: "subdivision",
+    name: "Kent",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["kent"],
+    codes: ["GB-KEN", "GBR-KEN"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-LIN",
+    kind: "subdivision",
+    name: "Lincolnshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["lincolnshire"],
+    codes: ["GB-LIN", "GBR-LIN"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NBL",
+    kind: "subdivision",
+    name: "Northumberland",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["northumberland"],
+    codes: ["GB-NBL", "GBR-NBL"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NTH",
+    kind: "subdivision",
+    name: "Northamptonshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["northamptonshire", "northants"],
+    codes: ["GB-NTH", "GBR-NTH"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NTT",
+    kind: "subdivision",
+    name: "Nottinghamshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["nottinghamshire"],
+    codes: ["GB-NTT", "GBR-NTT"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-NYK",
+    kind: "subdivision",
+    name: "North Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["n yorkshire", "north yorkshire"],
+    codes: ["GB-NYK", "GBR-NYK"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-OXF",
+    kind: "subdivision",
+    name: "Oxfordshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["oxfordshire"],
+    codes: ["GB-OXF", "GBR-OXF"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-RUT",
+    kind: "subdivision",
+    name: "Rutland",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["rutland"],
+    codes: ["GB-RUT", "GBR-RUT"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-SOM",
+    kind: "subdivision",
+    name: "Somerset",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["somerset"],
+    codes: ["GB-SOM", "GBR-SOM"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-SYK",
+    kind: "subdivision",
+    name: "South Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["s yorkshire", "south yorks", "south yorkshire"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-TWR",
+    kind: "subdivision",
+    name: "Tyne and Wear",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["tyne and wear", "tyne wear"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WIL",
+    kind: "subdivision",
+    name: "Wiltshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["wiltshire"],
+    codes: ["GB-WIL", "GBR-WIL"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WMD",
+    kind: "subdivision",
+    name: "West Midlands",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["w midlands", "west midlands"],
+    codes: [],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WOR",
+    kind: "subdivision",
+    name: "Worcestershire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["worcestershire"],
+    codes: ["GB-WOR", "GBR-WOR"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WSX",
+    kind: "subdivision",
+    name: "West Sussex",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["west sussex"],
+    codes: ["GB-WSX", "GBR-WSX"],
+    listedCutsOnly: true
+  },
+  {
+    id: "GBR-WYK",
+    kind: "subdivision",
+    name: "West Yorkshire",
+    geo: "GBR-ENG",
+    admin: null,
+    prints: ["w yorkshire", "west yorkshire"],
+    codes: [],
+    listedCutsOnly: true
+  },
   {
     id: "GBR-NIR",
     kind: "subdivision",
@@ -6654,29 +6924,49 @@ var PLACE_NODES = [
 ];
 
 var QUALIFIER_DELIMITER = /[,;:()[\]/–—-]/;
-var NEVER_PLACE = new Map([
-  ["de", "name particle: `De <Surname>`, and Spanish `de <Place>`"],
-  ["ni", "Irish patronymic particle: `Ní <Surname>`"],
-  ["mo", "Irish possessive: `Mo <Word>`"],
-  ["na", "Irish article: `Rince na <Word>`"],
-  ["in", "Irish preposition: `<Word> In <Word>`; and `Inc` truncated to `In`"],
-  ["co", "Company: `<Surname> & Co.`. Bracketed `(US-CO)` is still Colorado"],
-  ["id", "Irish Dance: `<Surname> School of ID`"],
-  ["sd", "School of Dance: `<Surname> SD`"]
-]);
-var NEVER_NAME = new Map([
-  ["de", "name particle: `De <Surname>`; and Spanish `de <Place>`"],
-  ["ni", "Irish patronymic particle: `Ní <Surname>`"],
-  ["ui", "Irish patronymic particle: `Uí <Surname>`"],
-  ["mo", "Irish possessive: `Mo <Word>`"],
-  ["na", "Irish article: `Rince na <Word>`"],
-  ["an", "Irish article: `<Word> an Rince`"],
-  ["in", "Irish preposition: `<Word> In <Word>`; and `Inc` truncated to `In`"],
-  ["co", "Company: `<Surname> & Co`"],
-  ["id", "Irish Dance: `ID de <Place>` keys the place, as `Irish Dancing de <Place>` does"],
-  ["sd", "School of Dance: `<Surname> SD`"],
-  ["da", "`Dance` truncated: `<Name> Academy of Irish Da` keys the name"]
-]);
+var SHORT_TOKEN_BARS = [
+  {
+    spelling: "de",
+    place: true,
+    name: true,
+    why: "name particle: `De <Surname>`, and Spanish `de <Place>`"
+  },
+  { spelling: "ni", place: true, name: true, why: "Irish patronymic particle: `Ní <Surname>`" },
+  { spelling: "ui", place: false, name: true, why: "Irish patronymic particle: `Uí <Surname>`" },
+  { spelling: "mo", place: true, name: true, why: "Irish possessive: `Mo <Word>`" },
+  { spelling: "na", place: true, name: true, why: "Irish article: `Rince na <Word>`" },
+  { spelling: "an", place: false, name: true, why: "Irish article: `<Word> an Rince`" },
+  {
+    spelling: "in",
+    place: true,
+    name: true,
+    why: "Irish preposition: `<Word> In <Word>`, and `Inc` truncated to `In`"
+  },
+  {
+    spelling: "co",
+    place: true,
+    name: true,
+    why: "Company: `<Surname> & Co.`. Bracketed `(US-CO)` is still Colorado"
+  },
+  {
+    spelling: "id",
+    place: true,
+    name: true,
+    why: "Irish Dance: `<Surname> School of ID`, and `ID de <Place>` keys the place, as `Irish Dancing de <Place>` does"
+  },
+  { spelling: "sd", place: true, name: true, why: "School of Dance: `<Surname> SD`" },
+  {
+    spelling: "da",
+    place: false,
+    name: true,
+    why: "`Dance` truncated: `<Name> Academy of Irish Da` keys the name"
+  }
+];
+function barred(flag) {
+  return new Map(SHORT_TOKEN_BARS.filter((row) => row[flag]).map((row) => [row.spelling, row.why]));
+}
+var NEVER_PLACE = barred("place");
+var NEVER_NAME = barred("name");
 var GENERIC_TLD = "com|net|org|edu|gov|mil|int|info|biz";
 var WEB_SPAN = new RegExp([
   "[A-Za-z][A-Za-z0-9+.-]*://\\S+",
@@ -7309,6 +7599,10 @@ function createPlaceReader2(options = {}) {
       return false;
     if (a.kind === b.kind)
       return true;
+    const sub = a.kind === "subdivision" ? a : b.kind === "subdivision" ? b : undefined;
+    const town = a.kind === "city" ? a : b.kind === "city" ? b : undefined;
+    if (sub !== undefined && town !== undefined && town.geo !== null && town.geo === sub.geo)
+      return true;
     const ca = countryOf(a);
     const cb = countryOf(b);
     return ca === undefined || cb === undefined || ca.id !== cb.id;
@@ -7343,7 +7637,9 @@ function createPlaceReader2(options = {}) {
             break;
           }
       if (!plural) {
-        const spent = members.filter((m) => m.kind === "country" && members.some((o) => o.id !== m.id && isAncestor(m, o)));
+        const tail = reads[reads.length - 1]?.heads ?? [];
+        const closes = (m) => m.kind === "subdivision" && tail.length === 1 && tail[0]?.id === m.id && members.length > 2 && members.every((o) => onTheMap(m, o));
+        const spent = members.filter((m) => m.kind === "country" && members.some((o) => o.id !== m.id && isAncestor(m, o)) || closes(m));
         const inner = members.filter((m) => !spent.includes(m));
         let apart = inner.length > 1 && spent.length > 0;
         for (let a = 0;a < inner.length && apart; a++)
@@ -7515,6 +7811,19 @@ function createPlaceReader2(options = {}) {
     });
     return abroad ? right : undefined;
   }
+  function townInCounty(left, right) {
+    if (left.length === 0 || right.length === 0)
+      return;
+    if (!left.every((l) => l.kind === "city") || !right.every((r) => r.kind === "subdivision"))
+      return;
+    if (left.some((l) => right.some((r) => relates(l, r))))
+      return;
+    const kept = left.filter((l) => {
+      const parent = l.geo === null ? undefined : idx().byId.get(l.geo);
+      return parent !== undefined && right.some((r) => r.id !== parent.id && onTheMap(parent, r));
+    });
+    return kept.length === 0 ? undefined : kept;
+  }
   function read(print, declared = false, smushed = true) {
     const core = unbracket(repair(print));
     if (fold(core) === "")
@@ -7577,13 +7886,14 @@ function createPlaceReader2(options = {}) {
           };
       }
       const qualified = (k) => k === "comma" || k === "space";
+      const listed = (k) => k === "amp" || k === "and" || k === "slash";
       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);
+        return qualifierAlone(prev.heads, r.heads) ?? (prev.truncated || before[n] !== "comma" || listed(before[n + 1]) ? undefined : townInCounty(prev.heads, r.heads));
       });
       settled.forEach((heads, n) => {
         if (heads === undefined)
@@ -7841,8 +8151,41 @@ function createPlaceReader2(options = {}) {
     const base = hit ?? built(print, declared, key);
     if (hit !== undefined)
       hits++;
+    if (declared && typeof ctx === "object" && base.arm === "unread" && base.refusal === null) {
+      const q = unheldQualifier(print, ctx);
+      if (q !== undefined)
+        return q.refine(ctx);
+    }
     return ctx === undefined ? base : base.refine(ctx);
   }
+  function unheldQualifier(print, ctx) {
+    const within = [ctx.country, ctx.near].filter((w) => w !== undefined && w.trim() !== "").flatMap((w) => headsOf(w));
+    if (within.length === 0)
+      return;
+    const core = unbracket(repair(print));
+    const pieces = core.split(SEP);
+    for (let k = 0;k < pieces.length; k += 2)
+      if (pieces[k] === "")
+        return;
+    let at = -1;
+    for (let k = pieces.length - 2;k >= 1 && at === -1; k -= 2)
+      if (kindOf(pieces[k]) === "comma")
+        at = k;
+    if (at === -1)
+      return;
+    const tail = read(pieces.slice(at + 1).join(""), true);
+    if (tail.heads.length > 0 || tail.refusal !== null)
+      return;
+    const town = read(pieces.slice(0, at).join(""), true);
+    if (town.refusal !== null || town.truncated || town.members !== undefined)
+      return;
+    if (town.heads.length === 0 || !town.heads.every((n) => n.kind === "city"))
+      return;
+    const kept = town.heads.filter((h) => within.some((w) => isAncestor(w, h)));
+    if (kept.length === 0)
+      return;
+    return build(print, chainsFor(kept), { ...town, heads: kept }, []);
+  }
   function heading(print, ctx) {
     const held = idx().byHeading.get(fold(repair(print)));
     if (held === undefined)

package/dist/person.js

@@ -106,8 +106,8 @@ class RoleRefusedName {
     return true;
   }
 }
-function roleName(role, print, order) {
-  const read = personName(print, order);
+function roleName(role, print, order, factory) {
+  const read = factory === undefined ? personName(print, order) : factory.parse(print, order);
   const sentinel = MATCHERS[role](print);
   return sentinel === undefined ? read : new RoleRefusedName(read, role, sentinel);
 }
@@ -116,7 +116,7 @@ function rolePrintsNoName(role, print) {
 }
 var dancerPrintsNoName = (print) => rolePrintsNoName("dancer", print);
 var seatName = (print) => roleName("adjudicator", print, "given-first");
-var dancerName = (print, order) => roleName("dancer", print, order);
+var dancerName = (print, order, factory) => roleName("dancer", print, order, factory);
 var teacherName = (print, order) => roleName("teacher", print, order);
 export {
   ADJUDICATOR_SENTINELS,

package/dist/place.js

@@ -17,7 +17,7 @@ import {
   placesRelation2,
   probablySamePlace2,
   sameReading2
-} from "./chunks/place-sa6438qr.js";
+} from "./chunks/place-39zj2ymq.js";
 import"./chunks/place-tcgfvemw.js";
 export {
   DEFAULT_PLACE_CAPACITY2 as DEFAULT_PLACE_CAPACITY,

package/dist/promotion.js

@@ -122,6 +122,12 @@ function mojibakeRead(print) {
   return out.replace(/\uFFFD/gu, "?");
 }
 function samePromotedName(was, now) {
+  if (samePromotedNameRead(was, now))
+    return true;
+  const soft = was.replace(/\u00c3\u00ad/gu, "?").replace(/\u00ad/gu, "-");
+  return soft !== was && samePromotedNameRead(soft, now);
+}
+function samePromotedNameRead(was, now) {
   const read = questionMarksRead(was, now);
   if (read === null)
     return false;

package/dist/school.js

@@ -12,7 +12,7 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-sa6438qr.js";
+} from "./chunks/place-39zj2ymq.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";
@@ -716,7 +716,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: true,
-      glued: true
+      glued: true,
+      matchKey: true
     }
   ],
   [
@@ -727,7 +728,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -738,7 +740,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -749,7 +752,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -760,7 +764,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: true,
-      glued: true
+      glued: true,
+      matchKey: true
     }
   ],
   [
@@ -771,7 +776,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -782,7 +788,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -793,7 +800,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "prefix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -804,7 +812,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "prefix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -815,7 +824,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "prefix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -826,7 +836,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "phrase",
       position: "prefix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -837,7 +848,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "phrase",
       position: "prefix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -848,7 +860,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "prefix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -859,7 +872,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: true,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -870,7 +884,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ],
   [
@@ -881,7 +896,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: true,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -892,7 +908,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: true,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -903,7 +920,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: true,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -914,7 +932,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: true
     }
   ],
   [
@@ -925,7 +944,8 @@ var SCHOOL_INSTITUTION_VOCABULARY = new Map([
       kind: "word",
       position: "suffix",
       truncatable: false,
-      glued: false
+      glued: false,
+      matchKey: false
     }
   ]
 ]);
@@ -958,28 +978,14 @@ function truncatedInstitution(tail) {
   }
   return found;
 }
+var MATCH_KEY_INSTITUTION_WORDS = [
+  ...new Set([...SCHOOL_INSTITUTION_VOCABULARY].filter(([, v]) => v.matchKey).flatMap(([k]) => k.split(" ")))
+].sort();
 
 import { normalizeApostrophes } from "@finbheara/names/lexicon";
 var SCHOOL_FLUFF_WORDS = new Set([
-  "academy",
-  "irish",
-  "dance",
-  "dancing",
-  "dancers",
-  "school",
-  "company",
-  "traditional",
-  "the",
-  "of",
-  "and",
-  "studio",
-  "center",
-  "centre",
-  "institute",
-  "scoil",
-  "rince",
-  "na",
-  "an"
+  ...[...SCHOOL_FLUFF_VOCABULARY.values()].filter((entry) => entry.tokenFluff).map((entry) => entry.canonical),
+  ...MATCH_KEY_INSTITUTION_WORDS
 ]);
 var SCHOOL_GENERIC_NAME_PARTS = new Set(["celtic", "clann"]);
 function hasSpecificToken(tokens) {
@@ -1142,8 +1148,9 @@ function createSchoolNameReader(options = {}) {
   function readSpacingAcute(print) {
     return print.replace(SPACING_ACUTE_AFTER_VOWEL, "$1́").replace(SPACING_ACUTE, "'");
   }
+  const INJECTED_LINK = /(?<=^|[\s([])(?:https?:\/\/|www\.)[^\s)\]]+/giu;
   function renderSn1(print) {
-    return normalizeApostrophes2(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(INJECTED_LINK, " ").replace(/\s+/gu, " ").trim();
   }
   const COMPOUND_OPENERS = new Set([
     "hyphen",

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" | "adult-band" | "range-overlapping" | "range-as-under" | "range-top-meets-over" | "range-adult-floor";
+export type AgeClause = "under-floored-on-rung" | "under-stride" | "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/person.d.ts

@@ -1,4 +1,4 @@
-import { type ParseOrder, type PersonName } from "@finbheara/names/normalize";
+import { type ParseOrder, type PersonName, type PersonNameFactory } from "@finbheara/names/normalize";
 import { type RowSentinel } from "./row-sentinels.ts";
 export { SHARED_ROW_SENTINELS, sentinelIn } from "./row-sentinels.ts";
 export type { RowSentinel } from "./row-sentinels.ts";
@@ -8,9 +8,9 @@ export declare const DANCER_SENTINELS: readonly RowSentinel[];
 export declare const TEACHER_SENTINELS: readonly RowSentinel[];
 export declare const ROLE_SENTINELS: Readonly<Record<PersonRole, readonly RowSentinel[]>>;
 export declare function roleSentinelOf(role: PersonRole, print: string): RowSentinel | undefined;
-export declare function roleName(role: PersonRole, print: string, order?: ParseOrder): PersonName;
+export declare function roleName(role: PersonRole, print: string, order?: ParseOrder, factory?: Pick<PersonNameFactory, "parse">): PersonName;
 export declare function rolePrintsNoName(role: PersonRole, print: string): boolean;
 export declare const dancerPrintsNoName: (print: string) => boolean;
 export declare const seatName: (print: string) => PersonName;
-export declare const dancerName: (print: string, order?: ParseOrder) => PersonName;
+export declare const dancerName: (print: string, order?: ParseOrder, factory?: Pick<PersonNameFactory, "parse">) => PersonName;
 export declare const teacherName: (print: string, order?: ParseOrder) => PersonName;

package/dist/types/school-institution-vocabulary.d.ts

@@ -8,6 +8,7 @@ export interface SchoolInstitution {
     position: InstitutionPosition;
     truncatable: boolean;
     glued: boolean;
+    matchKey: boolean;
 }
 export declare const SCHOOL_INSTITUTION_VOCABULARY: ReadonlyMap<string, SchoolInstitution>;
 export declare function schoolInstitution(text: string): SchoolInstitution | undefined;
@@ -18,3 +19,4 @@ export declare const INSTITUTION_TYPES: readonly InstitutionType[];
 export declare const INSTITUTION_PHRASES: readonly string[];
 export declare const GLUED_INSTITUTION_SUFFIXES: readonly string[];
 export declare function truncatedInstitution(tail: string): SchoolInstitution | undefined;
+export declare const MATCH_KEY_INSTITUTION_WORDS: readonly string[];

package/dist/types/school-tokens.d.ts

@@ -1,5 +1,4 @@
 import type { InstitutionType as RegisterType } from "./school-institution-vocabulary.ts";
-export declare const LEGACY_EXCEPTION_PHRASES: ReadonlySet<string>;
 export type SchoolTokenClass = "NAME_PART" | "INSTITUTION_TYPE" | "FLUFF" | "LOCATION_HINT";
 export interface SchoolToken {
     text: string;

package/package.json

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