@finbheara/domain 0.5.0 → 0.6.2

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

@@ -2,6 +2,8 @@ import {
   validity
 } from "./place-q9kwsmzd.js";
 
+import { isPlaceholderPrint } from "@finbheara/names/normalize";
+
 var PLACE_NODES = [
   {
     id: "world",
@@ -164,9 +166,11 @@ var PLACE_NODES = [
       "serc",
       "southern england",
       "southern region",
-      "southern region england"
+      "southern region england",
+      "southern region uk"
     ],
     codes: ["ENG_SOUTH"],
+    headings: ["southern"],
     truncations: ["southern regi", "southern regio"],
     oireachtas: "ENG_SOUTH"
   },
@@ -306,7 +310,7 @@ var PLACE_NODES = [
     name: "New Zealand",
     geo: "NZL",
     admin: "world",
-    prints: ["tidanz"],
+    prints: ["nua shealainn new zealand", "tidanz"],
     codes: [],
     oireachtas: "NZ"
   },
@@ -316,7 +320,14 @@ var PLACE_NODES = [
     name: "Continental Europe & Asia (RCCEA)",
     geo: null,
     admin: "world",
-    prints: ["an eoraip", "continental europe and asia", "eoraip", "rccea", "rtme"],
+    prints: [
+      "an eoraip",
+      "an eoraip europe",
+      "continental europe and asia",
+      "eoraip",
+      "rccea",
+      "rtme"
+    ],
     codes: ["RCCEA"],
     oireachtas: "RCCEA"
   },
@@ -336,7 +347,7 @@ var PLACE_NODES = [
     name: "South Africa",
     geo: "ZAF",
     admin: "world",
-    prints: [],
+    prints: ["an afraic theas south africa"],
     codes: ["SOUTH_AFRICA"],
     oireachtas: "SOUTH_AFRICA"
   },
@@ -2635,7 +2646,7 @@ var PLACE_NODES = [
     name: "Russia",
     geo: "europe",
     admin: "RCCEA",
-    prints: ["rus", "russia"],
+    prints: ["an ruis russia", "rus", "russia", "russia ruisis"],
     codes: [],
     iso2: "RU",
     iso3: "RUS",
@@ -3378,7 +3389,8 @@ var PLACE_NODES = [
     geo: "AUS",
     admin: "AUSTRALIA",
     prints: ["northern territory"],
-    codes: ["AU-NT", "AUS-NT", "NT"]
+    codes: ["AU-NT", "AUS-NT", "NT"],
+    headings: ["nothern territory"]
   },
   {
     id: "AUS-QLD",
@@ -3396,7 +3408,8 @@ var PLACE_NODES = [
     geo: "AUS",
     admin: "AUSTRALIA",
     prints: ["deisceart na hastraile", "reigiun deisceart na hastraile", "south australia"],
-    codes: ["AU-SA", "AUS-SA", "SA"]
+    codes: ["AU-SA", "AUS-SA", "SA"],
+    headings: ["south"]
   },
   {
     id: "AUS-TAS",
@@ -3428,7 +3441,8 @@ var PLACE_NODES = [
       "reigiun iarrthar na hastraile",
       "western australia"
     ],
-    codes: ["AU-WA", "AUS-WA", "WA"]
+    codes: ["AU-WA", "AUS-WA", "WA"],
+    headings: ["western"]
   },
   {
     id: "CAN-AB",
@@ -3869,6 +3883,15 @@ var PLACE_NODES = [
     prints: ["co wexford", "county wexford", "wexford"],
     codes: ["IE-WX"]
   },
+  {
+    id: "MEX-QUE",
+    kind: "subdivision",
+    name: "Querétaro",
+    geo: "MEX",
+    admin: null,
+    prints: ["queretaro"],
+    codes: ["MX-QUE"]
+  },
   {
     id: "USA-AK",
     kind: "subdivision",
@@ -4538,6 +4561,15 @@ var PLACE_NODES = [
     prints: ["winnipeg"],
     codes: []
   },
+  {
+    id: "CAN-NB/fredericton",
+    kind: "city",
+    name: "Fredericton",
+    geo: "CAN-NB",
+    admin: "IDTANA-ECRO",
+    prints: ["fredericton"],
+    codes: []
+  },
   {
     id: "CAN-NS/halifax",
     kind: "city",
@@ -4592,6 +4624,15 @@ var PLACE_NODES = [
     prints: ["mississauga"],
     codes: []
   },
+  {
+    id: "CAN-ON/niagara-falls",
+    kind: "city",
+    name: "Niagara Falls",
+    geo: "CAN-ON",
+    admin: "IDTANA-ECRO",
+    prints: ["niagara falls"],
+    codes: []
+  },
   {
     id: "CAN-ON/oakville",
     kind: "city",
@@ -4637,13 +4678,31 @@ var PLACE_NODES = [
     prints: ["toronto"],
     codes: []
   },
+  {
+    id: "CAN-ON/whitby",
+    kind: "city",
+    name: "Whitby",
+    geo: "CAN-ON",
+    admin: "IDTANA-ECRO",
+    prints: ["whitby"],
+    codes: []
+  },
   {
     id: "CAN-ON/windsor",
     kind: "city",
     name: "Windsor",
     geo: "CAN-ON",
     admin: "IDTANA-ECRO",
-    prints: ["windsor"],
+    prints: ["windsor", "winsor"],
+    codes: []
+  },
+  {
+    id: "CAN-QC/hudson",
+    kind: "city",
+    name: "Hudson",
+    geo: "CAN-QC",
+    admin: "IDTANA-ECRO",
+    prints: ["hudson"],
     codes: []
   },
   {
@@ -4701,6 +4760,15 @@ var PLACE_NODES = [
     prints: ["berlin"],
     codes: []
   },
+  {
+    id: "DEU/landstuhl",
+    kind: "city",
+    name: "Landstuhl",
+    geo: "DEU",
+    admin: "RCCEA",
+    prints: ["landstuhl"],
+    codes: []
+  },
   {
     id: "ESP/barcelona",
     kind: "city",
@@ -5223,6 +5291,15 @@ var PLACE_NODES = [
     prints: ["bay area"],
     codes: []
   },
+  {
+    id: "USA-CA/danville",
+    kind: "city",
+    name: "Danville",
+    geo: "USA-CA",
+    admin: "IDTANA-WUSRO",
+    prints: ["danville"],
+    codes: []
+  },
   {
     id: "USA-CA/dublin",
     kind: "city",
@@ -5332,6 +5409,15 @@ var PLACE_NODES = [
     prints: ["wilmington"],
     codes: []
   },
+  {
+    id: "USA-DE/yorklyn",
+    kind: "city",
+    name: "Yorklyn",
+    geo: "USA-DE",
+    admin: "IDTANA-MARO",
+    prints: ["yorklyn"],
+    codes: []
+  },
   {
     id: "USA-FL/gainesville",
     kind: "city",
@@ -5350,6 +5436,15 @@ var PLACE_NODES = [
     prints: ["jacksonville"],
     codes: []
   },
+  {
+    id: "USA-FL/kissimmee",
+    kind: "city",
+    name: "Kissimmee",
+    geo: "USA-FL",
+    admin: "IDTANA-SRO",
+    prints: ["kissimmee"],
+    codes: []
+  },
   {
     id: "USA-FL/miami",
     kind: "city",
@@ -5404,6 +5499,15 @@ var PLACE_NODES = [
     prints: ["tampa"],
     codes: []
   },
+  {
+    id: "USA-FL/winter-garden",
+    kind: "city",
+    name: "Winter Garden",
+    geo: "USA-FL",
+    admin: "IDTANA-SRO",
+    prints: ["winter garden"],
+    codes: []
+  },
   {
     id: "USA-GA/atlanta",
     kind: "city",
@@ -5458,6 +5562,33 @@ var PLACE_NODES = [
     prints: ["chicago"],
     codes: []
   },
+  {
+    id: "USA-IL/lemont",
+    kind: "city",
+    name: "Lemont",
+    geo: "USA-IL",
+    admin: "IDTANA-MAO",
+    prints: ["lemont"],
+    codes: []
+  },
+  {
+    id: "USA-IL/niles",
+    kind: "city",
+    name: "Niles",
+    geo: "USA-IL",
+    admin: "IDTANA-MAO",
+    prints: ["niles"],
+    codes: []
+  },
+  {
+    id: "USA-IL/o-fallon",
+    kind: "city",
+    name: "O'Fallon",
+    geo: "USA-IL",
+    admin: "IDTANA-MAO",
+    prints: ["o fallon"],
+    codes: []
+  },
   {
     id: "USA-IL/springfield",
     kind: "city",
@@ -5539,6 +5670,15 @@ var PLACE_NODES = [
     prints: ["lexington"],
     codes: []
   },
+  {
+    id: "USA-MA/quincy",
+    kind: "city",
+    name: "Quincy",
+    geo: "USA-MA",
+    admin: "IDTANA-NERO",
+    prints: ["quincy"],
+    codes: []
+  },
   {
     id: "USA-MA/springfield",
     kind: "city",
@@ -5576,6 +5716,24 @@ var PLACE_NODES = [
     codes: [],
     truncations: ["baltimor"]
   },
+  {
+    id: "USA-MD/columbia",
+    kind: "city",
+    name: "Columbia",
+    geo: "USA-MD",
+    admin: "IDTANA-SRO",
+    prints: ["columbia"],
+    codes: []
+  },
+  {
+    id: "USA-MD/salisbury",
+    kind: "city",
+    name: "Salisbury",
+    geo: "USA-MD",
+    admin: "IDTANA-SRO",
+    prints: ["salisbury"],
+    codes: []
+  },
   {
     id: "USA-ME/portland",
     kind: "city",
@@ -5711,6 +5869,16 @@ var PLACE_NODES = [
     prints: ["greensboro"],
     codes: []
   },
+  {
+    id: "USA-NC/mooresville",
+    kind: "city",
+    name: "Mooresville",
+    geo: "USA-NC",
+    admin: "IDTANA-SRO",
+    prints: ["mooresville"],
+    codes: [],
+    listedCutsOnly: true
+  },
   {
     id: "USA-NC/raleigh",
     kind: "city",
@@ -5774,6 +5942,15 @@ var PLACE_NODES = [
     prints: ["trenton"],
     codes: []
   },
+  {
+    id: "USA-NJ/wall-township",
+    kind: "city",
+    name: "Wall Township",
+    geo: "USA-NJ",
+    admin: "IDTANA-MARO",
+    prints: ["wall township"],
+    codes: []
+  },
   {
     id: "USA-NM/albuquerque",
     kind: "city",
@@ -5783,6 +5960,15 @@ var PLACE_NODES = [
     prints: ["albuquerque"],
     codes: []
   },
+  {
+    id: "USA-NM/rio-rancho",
+    kind: "city",
+    name: "Rio Rancho",
+    geo: "USA-NM",
+    admin: "IDTANA-WUSRO",
+    prints: ["rio rancho"],
+    codes: []
+  },
   {
     id: "USA-NM/santa-fe",
     kind: "city",
@@ -5819,6 +6005,15 @@ var PLACE_NODES = [
     prints: ["albany"],
     codes: []
   },
+  {
+    id: "USA-NY/baldwin-place",
+    kind: "city",
+    name: "Baldwin Place",
+    geo: "USA-NY",
+    admin: "IDTANA-MARO",
+    prints: ["baldwin place"],
+    codes: []
+  },
   {
     id: "USA-NY/buffalo",
     kind: "city",
@@ -5828,6 +6023,15 @@ var PLACE_NODES = [
     prints: ["buffalo"],
     codes: []
   },
+  {
+    id: "USA-NY/grand-island",
+    kind: "city",
+    name: "Grand Island",
+    geo: "USA-NY",
+    admin: "IDTANA-MARO",
+    prints: ["grand island"],
+    codes: []
+  },
   {
     id: "USA-NY/kingston",
     kind: "city",
@@ -5900,6 +6104,15 @@ var PLACE_NODES = [
     prints: ["syracuse"],
     codes: []
   },
+  {
+    id: "USA-NY/webster",
+    kind: "city",
+    name: "Webster",
+    geo: "USA-NY",
+    admin: "IDTANA-MARO",
+    prints: ["webster"],
+    codes: []
+  },
   {
     id: "USA-OH/akron",
     kind: "city",
@@ -5954,6 +6167,15 @@ var PLACE_NODES = [
     prints: ["dublin"],
     codes: []
   },
+  {
+    id: "USA-OH/richfield",
+    kind: "city",
+    name: "Richfield",
+    geo: "USA-OH",
+    admin: "IDTANA-MAO",
+    prints: ["richfield"],
+    codes: []
+  },
   {
     id: "USA-OH/toledo",
     kind: "city",
@@ -6017,6 +6239,16 @@ var PLACE_NODES = [
     prints: ["ardmore"],
     codes: []
   },
+  {
+    id: "USA-PA/erie",
+    kind: "city",
+    name: "Erie",
+    geo: "USA-PA",
+    admin: "IDTANA-MARO",
+    prints: ["erie"],
+    codes: [],
+    runPrints: ["eire"]
+  },
   {
     id: "USA-PA/lancaster",
     kind: "city",
@@ -6189,6 +6421,15 @@ var PLACE_NODES = [
     prints: ["north texas"],
     codes: []
   },
+  {
+    id: "USA-TX/richardson",
+    kind: "city",
+    name: "Richardson",
+    geo: "USA-TX",
+    admin: "IDTANA-SRO",
+    prints: ["richardson"],
+    codes: []
+  },
   {
     id: "USA-TX/san-antonio",
     kind: "city",
@@ -6207,6 +6448,15 @@ var PLACE_NODES = [
     prints: ["south texas"],
     codes: []
   },
+  {
+    id: "USA-UT/cedar-hills",
+    kind: "city",
+    name: "Cedar Hills",
+    geo: "USA-UT",
+    admin: "IDTANA-WUSRO",
+    prints: ["cedar hills"],
+    codes: []
+  },
   {
     id: "USA-UT/salt-lake-city",
     kind: "city",
@@ -6306,6 +6556,15 @@ var PLACE_NODES = [
     prints: ["burlington"],
     codes: []
   },
+  {
+    id: "USA-WA/lynnwood",
+    kind: "city",
+    name: "Lynnwood",
+    geo: "USA-WA",
+    admin: "IDTANA-WUSRO",
+    prints: ["lynnwood"],
+    codes: []
+  },
   {
     id: "USA-WA/olympia",
     kind: "city",
@@ -6362,6 +6621,135 @@ 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 GENERIC_TLD = "com|net|org|edu|gov|mil|int|info|biz";
+var WEB_SPAN = new RegExp([
+  "[A-Za-z][A-Za-z0-9+.-]*://\\S+",
+  "(?:^|[\\s([])www\\.\\S+",
+  "[^\\s@]+@[^\\s@]+\\.[A-Za-z]{2,}",
+  `(?<![A-Za-z0-9.@-])(?:[A-Za-z0-9][A-Za-z0-9-]*\\.)*[A-Za-z0-9][A-Za-z0-9-]+\\.(?:${GENERIC_TLD})(?![A-Za-z0-9-])`
+].join("|"), "giu");
+function printsWeb(raw) {
+  for (const _ of raw.matchAll(WEB_SPAN))
+    return true;
+  return false;
+}
+function printZones(raw) {
+  const qualifier = new Set;
+  const bracketed = new Set;
+  const qualifierAny = new Set;
+  const runs = [...raw.matchAll(/[A-Za-z0-9]+/g)];
+  const web = [];
+  for (const m of raw.matchAll(WEB_SPAN))
+    web.push([m.index ?? 0, (m.index ?? 0) + m[0].length]);
+  const inside = new Set;
+  const outside = new Set;
+  const trailing = new Set;
+  for (let i = runs.length - 1;i > 0; i--) {
+    const here = runs[i];
+    const prev = runs[i - 1];
+    if (here === undefined || prev === undefined)
+      break;
+    const gap = raw.slice((prev.index ?? 0) + prev[0].length, here.index ?? 0);
+    if (!QUALIFIER_DELIMITER.test(gap))
+      break;
+    if (i - 1 === 0)
+      break;
+    trailing.add(i - 1);
+  }
+  let depth = 0;
+  let cursor = 0;
+  for (let i = 0;i < runs.length; i++) {
+    const run = runs[i];
+    const text = run?.[0];
+    if (run === undefined || text === undefined)
+      continue;
+    const at = run.index ?? cursor;
+    for (const ch of raw.slice(cursor, at)) {
+      if (ch === "(" || ch === "[")
+        depth++;
+      else if ((ch === ")" || ch === "]") && depth > 0)
+        depth--;
+    }
+    cursor = at + text.length;
+    const folded = text.toLowerCase().normalize("NFD").replace(/[̀-ͯ]/g, "");
+    (web.some(([s, e]) => at >= s && at < e) ? inside : outside).add(folded);
+    const before = raw.slice(0, at).trimEnd().slice(-1);
+    const after = raw.slice(cursor).trimStart().slice(0, 1);
+    const atQualifier = i === runs.length - 1 || before !== "" && QUALIFIER_DELIMITER.test(before) || after !== "" && QUALIFIER_DELIMITER.test(after) && trailing.has(i);
+    if (atQualifier)
+      qualifierAny.add(folded);
+    if (folded.length > 2)
+      continue;
+    if (atQualifier)
+      qualifier.add(folded);
+    if (depth > 0)
+      bracketed.add(folded);
+  }
+  const webOnly = new Set([...inside].filter((f) => !outside.has(f)));
+  return { qualifier, bracketed, qualifierAny, web, webOnly, tailCode: tailCode(raw, runs) };
+}
+var GOVERNS_THE_NEXT_WORD = new Set(["de", "mo"]);
+function tailCode(raw, runs) {
+  const last = runs[runs.length - 1];
+  const prev = runs[runs.length - 2];
+  if (last === undefined || prev === undefined)
+    return null;
+  const text = last[0];
+  if (text.length > 2 || text !== text.toUpperCase() || !/^[A-Z]+$/.test(text))
+    return null;
+  const at = last.index ?? 0;
+  const folded = text.toLowerCase();
+  const gap = raw.slice((prev.index ?? 0) + prev[0].length, at);
+  const marked = /[,;:/\\\u2013\u2014]/u.test(gap) || /\s-|-\s/u.test(gap);
+  const bare = GOVERNS_THE_NEXT_WORD.has(folded) && /^\s+$/u.test(gap) && /\p{Ll}/u.test(raw);
+  if (!marked && !bare)
+    return null;
+  const only = runs.filter((r) => r[0].toLowerCase() === folded).length === 1;
+  return { folded, at, only };
+}
+function opensLocation(folded, at, index) {
+  if (index === undefined ? at.webOnly.has(folded) : inWebSpan(at, index))
+    return false;
+  if (folded.length > 2)
+    return true;
+  if (NEVER_PLACE.has(folded))
+    return at.bracketed.has(folded) || isTailCode(folded, at, index);
+  return at.qualifier.has(folded);
+}
+function isTailCode(folded, at, index) {
+  const tail = at.tailCode;
+  if (tail === null || tail.folded !== folded)
+    return false;
+  return index === undefined ? tail.only : index === tail.at;
+}
+function inWebSpan(at, index) {
+  return at.web.some(([start, end]) => index >= start && index < end);
+}
+
 var DEFAULT_PLACE_CAPACITY2 = 8192;
 function createPlaceReader2(options = {}) {
   const nodes = options.tree ?? PLACE_NODES;
@@ -6380,8 +6768,34 @@ function createPlaceReader2(options = {}) {
     "none",
     "null",
     "tbd",
-    "unknown"
+    "unknown",
+    "address withheld"
+  ]);
+  const ONLINE = new Set([
+    "online",
+    "online feis",
+    "video feis",
+    "virtual",
+    "virtual feis"
   ]);
+  const NOTICE = "change of location";
+  function garbageOf(print) {
+    const raw = repair(print);
+    if (raw === "")
+      return;
+    if (raw.includes("�"))
+      return "damaged";
+    if (printsWeb(raw))
+      return "web";
+    const folded = fold(raw);
+    if (ONLINE.has(folded))
+      return "online";
+    if (folded === NOTICE || folded.startsWith(`${NOTICE} `))
+      return "notice";
+    if (isPlaceholderPrint(raw))
+      return "placeholder";
+    return;
+  }
   function fold(s) {
     return s.normalize("NFD").replace(/\p{M}+/gu, "").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
   }
@@ -6411,7 +6825,13 @@ function createPlaceReader2(options = {}) {
     const bySubdivisionPart = new Map;
     const byOireachtas = new Map;
     const listedPhrases = new Set;
+    const byHeading = new Map;
+    const byRunPrint = new Map;
     for (const n of source) {
+      for (const h of n.headings ?? [])
+        push(byHeading, fold(h), n);
+      for (const r of n.runPrints ?? [])
+        push(byRunPrint, fold(r), n);
       push(byPrint, fold(n.id), n);
       if (n.kind !== "body")
         push(byPrint, fold(n.name), n);
@@ -6444,28 +6864,50 @@ function createPlaceReader2(options = {}) {
           push(bySubdivisionPart, fold(p), n);
       }
     }
-    const ancestorsOf = new Map;
-    const walk = (n, seen) => {
-      const had = ancestorsOf.get(n.id);
-      if (had !== undefined)
-        return had;
-      const out = new Set;
+    const geoAbove = (n, target) => {
+      const seen = new Set;
+      for (let at = n.geo;at !== null && !seen.has(at); ) {
+        if (at === target)
+          return true;
+        seen.add(at);
+        at = byId.get(at)?.geo ?? null;
+      }
+      return false;
+    };
+    const carries = new Map;
+    const upOf = (n) => {
+      const out = [];
       for (const up of [n.geo, n.admin]) {
-        if (up === null || up === undefined || seen.has(up))
+        if (up === null || up === undefined)
           continue;
         const parent = byId.get(up);
         if (parent === undefined)
           continue;
-        out.add(parent.id);
-        seen.add(parent.id);
-        for (const id of walk(parent, seen))
-          out.add(id);
+        if (up === n.admin && geoAbove(parent, n.id)) {
+          carries.set(n.id, [...carries.get(n.id) ?? [], parent]);
+          continue;
+        }
+        out.push(parent);
       }
-      ancestorsOf.set(n.id, out);
       return out;
     };
+    const parents = new Map;
     for (const n of source)
-      walk(n, new Set([n.id]));
+      parents.set(n.id, upOf(n));
+    const ancestorsOf = new Map;
+    for (const n of source) {
+      const out = new Set;
+      const todo = [n];
+      for (let at = todo.pop();at !== undefined; at = todo.pop()) {
+        for (const parent of parents.get(at.id) ?? []) {
+          if (parent.id === n.id || out.has(parent.id))
+            continue;
+          out.add(parent.id);
+          todo.push(parent);
+        }
+      }
+      ancestorsOf.set(n.id, out);
+    }
     const phrases = [...byPrint.keys()].filter((k) => k.includes(" ")).sort((a, b) => b.length - a.length);
     return {
       byId,
@@ -6476,8 +6918,11 @@ function createPlaceReader2(options = {}) {
       bySubdivisionPart,
       byOireachtas,
       ancestorsOf,
+      carries,
       phrases,
-      listedPhrases
+      listedPhrases,
+      byHeading,
+      byRunPrint
     };
   }
   function idx() {
@@ -6598,6 +7043,10 @@ function createPlaceReader2(options = {}) {
       if (n !== undefined && CARRIED.has(n.kind))
         out.set(n.id, n);
     }
+    for (const n of [...out.values()])
+      for (const r of idx().carries.get(n.id) ?? [])
+        if (CARRIED.has(r.kind))
+          out.set(r.id, r);
     return { head, nodes: ordered([...out.values()]) };
   }
   const NOTHING = { heads: [], match: null, truncated: false, refusal: null };
@@ -6714,7 +7163,7 @@ function createPlaceReader2(options = {}) {
       if (key[folded.length] === " ")
         continue;
       for (const n of found)
-        if (n.kind !== "body")
+        if (n.kind !== "body" && n.listedCutsOnly !== true)
           out.push({ node: n, length: key.length });
     }
     return out;
@@ -6910,7 +7359,55 @@ function createPlaceReader2(options = {}) {
     }
     return;
   }
-  function read(print, declared = false) {
+  const SMUSH = /\p{Ll}(?=\p{Lu})/gu;
+  function smushes(s) {
+    return [...s.matchAll(SMUSH)].map((m) => m.index + 1).reverse();
+  }
+  function namedInside(piece, outer, kinds) {
+    return (idx().byPrint.get(fold(piece)) ?? []).filter((n) => n.id !== outer.id && isAncestor(outer, n) && (kinds === undefined || kinds.includes(n.kind)));
+  }
+  function desmush(core, declared) {
+    for (const b of smushes(core)) {
+      const countries = (idx().byPrint.get(fold(core.slice(b))) ?? []).filter((n) => n.kind === "country");
+      if (countries.length !== 1)
+        continue;
+      const country = countries[0];
+      const left = core.slice(0, b).trim();
+      if (left === "")
+        return;
+      const pieces = pieced(left, country);
+      if (pieces === undefined)
+        return;
+      const r = read([...pieces, core.slice(b).trim()].join(", "), declared, false);
+      if (r.heads.length === 0 || r.refusal !== null)
+        return;
+      return { ...r, match: "desmushed" };
+    }
+    return;
+  }
+  function pieced(left, country) {
+    if (namedInside(left, country).length > 0)
+      return [left];
+    for (const b of smushes(left)) {
+      const subs = namedInside(left.slice(b), country, ["subdivision"]);
+      if (subs.length === 0)
+        continue;
+      const head = left.slice(0, b).trim();
+      if (head === "")
+        return;
+      const sub = left.slice(b).trim();
+      if (subs.some((s) => namedInside(head, s).length > 0))
+        return [head, sub];
+      const run = runInside(head, subs);
+      return run === undefined ? undefined : [run.name, sub];
+    }
+    return;
+  }
+  function runInside(piece, subs) {
+    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 read(print, declared = false, smushed = true) {
     const core = unbracket(repair(print));
     if (fold(core) === "")
       return NOTHING;
@@ -6990,7 +7487,7 @@ function createPlaceReader2(options = {}) {
     }
     const first = sane[0];
     if (first === undefined)
-      return NOTHING;
+      return (smushed ? desmush(core, declared) : undefined) ?? NOTHING;
     if (sane.length === 1)
       return first;
     const heads = [];
@@ -7209,6 +7706,11 @@ function createPlaceReader2(options = {}) {
   let evictions = 0;
   function place(print, ctx) {
     const declared = typeof ctx === "object" && ctx.declared === true;
+    if (declared && typeof ctx === "object") {
+      const h = heading(print, ctx);
+      if (h !== undefined)
+        return h;
+    }
     const key = declared ? `\x01d\x01${print}` : print;
     const hit = cache.get(key);
     const base = hit ?? built(print, declared, key);
@@ -7216,6 +7718,21 @@ function createPlaceReader2(options = {}) {
       hits++;
     return ctx === undefined ? base : base.refine(ctx);
   }
+  function heading(print, ctx) {
+    const held = idx().byHeading.get(fold(repair(print)));
+    if (held === undefined)
+      return;
+    const within = [ctx.country, ctx.near].filter((w) => w !== undefined && w.trim() !== "").flatMap((w) => headsOf(w));
+    const hits = held.filter((n) => {
+      const parent = n.geo === null ? undefined : idx().byId.get(n.geo);
+      return parent !== undefined && within.some((o) => isAncestor(parent, o));
+    });
+    const hit = hits.length === 1 ? hits[0] : undefined;
+    if (hit === undefined)
+      return;
+    const r = { heads: [hit], match: "print", truncated: false, refusal: null };
+    return build(print, [chainOf(hit)], r, []);
+  }
   function isPlaceToken(token, cut = false, declared = false) {
     const i = idx();
     const t = token.trim();
@@ -7248,7 +7765,9 @@ function createPlaceReader2(options = {}) {
   const CONNECTOR = new Set(["and", "&", "+", "/", ",", "-", "y", "agus"]);
   function built(print, declared = false, key = print) {
     misses++;
-    const r = read(print, declared);
+    const store = read(print, declared);
+    const garbage = store.heads.length === 0 && store.refusal === null ? garbageOf(print) : undefined;
+    const r = garbage === undefined ? store : { ...NOTHING, refusal: garbage };
     const chains = chainsFor(r.heads);
     const made = build(print, chains, r, []);
     if (capacity > 0) {
@@ -7413,4 +7932,4 @@ function sameReading2(a, b) {
   return DEFAULT_PLACE_READER2.sameReading(a, b);
 }
 
-export { DEFAULT_PLACE_CAPACITY2, createPlaceReader2, DEFAULT_PLACE_READER2, place2, isPlaceToken2, countryCodeOf2, areAllPlaceTokens2, placeFromId2, oireachtasOfRegion2, regionOfOireachtas2, placeStats2, resetPlaceCache2, placeRelation2, placesRelation2, probablySamePlace2, sameReading2 };
+export { NEVER_NAME, printZones, opensLocation, DEFAULT_PLACE_CAPACITY2, createPlaceReader2, DEFAULT_PLACE_READER2, place2, isPlaceToken2, countryCodeOf2, areAllPlaceTokens2, placeFromId2, oireachtasOfRegion2, regionOfOireachtas2, placeStats2, resetPlaceCache2, placeRelation2, placesRelation2, probablySamePlace2, sameReading2 };