@finbheara/domain 0.37.0 → 0.39.0

package/dist/age.js

@@ -1,8 +1,10 @@
 import {
   printsUnderOpen2,
+  printsAdultCode2,
   TITLE_RANGE_MIN2,
   TITLE_RANGE_MAX2,
   ageTitleToken2,
+  readsSeniorAdult2,
   adultBeside2,
   YOUNGEST_FLOOR2,
   ADULT_FLOOR2,
@@ -37,7 +39,7 @@ import {
   youngFloor2,
   tooYoungForMajor2,
   tooYoungForFeis2
-} from "./chunks/place-3w1mr2vh.js";
+} from "./chunks/place-mpeps8tn.js";
 export {
   ADULT_FLOOR2 as ADULT_FLOOR,
   AVERAGE_AGE_DECIMALS2 as AVERAGE_AGE_DECIMALS,
@@ -67,7 +69,9 @@ export {
   canOverlap2 as canOverlap,
   intersectBirthYears2 as intersectBirthYears,
   isAveraged2 as isAveraged,
+  printsAdultCode2 as printsAdultCode,
   printsUnderOpen2 as printsUnderOpen,
+  readsSeniorAdult2 as readsSeniorAdult,
   roundedMeanHundredths2 as roundedMeanHundredths,
   tooYoungForFeis2 as tooYoungForFeis,
   tooYoungForMajor2 as tooYoungForMajor,

package/dist/chunks/{place-8kvsn5wp.js → place-k6y6fe1y.js}

@@ -7404,12 +7404,28 @@ function inWebSpan(at, index) {
   return at.web.some(([start, end]) => index >= start && index < end);
 }
 
+var GENERIC_WORDS2 = {
+  saint: "st",
+  sainte: "ste",
+  fort: "ft",
+  mount: "mt"
+};
+var GENERIC_SHORT = new Set(Object.values(GENERIC_WORDS2));
+function genericKey2(folded) {
+  const sp = folded.indexOf(" ");
+  if (sp <= 0 || sp === folded.length - 1)
+    return;
+  const head = folded.slice(0, sp);
+  const short = GENERIC_WORDS2[head] ?? (GENERIC_SHORT.has(head) ? head : undefined);
+  return short === undefined ? undefined : `${short}${folded.slice(sp)}`;
+}
 var DEFAULT_PLACE_CAPACITY2 = 8192;
 var PLACE_CELL_SENTINELS = [...SHARED_ROW_SENTINELS2];
 var placeCellSentinelOf = sentinelIn2(PLACE_CELL_SENTINELS);
 function createPlaceReader2(options = {}) {
   const nodes = options.tree ?? PLACE_NODES;
   const withinTable = options.within ?? PLACE_WITHIN;
+  const generic = options.generic === true;
   let index;
   const given = options.refusals;
   const refusals = given === undefined ? () => {
@@ -7484,7 +7500,14 @@ function createPlaceReader2(options = {}) {
     const listedPhrases = new Set;
     const byHeading = new Map;
     const byRunPrint = new Map;
+    const byGeneric = new Map;
     for (const n of source) {
+      if (generic && n.kind === "city")
+        for (const p of [n.name, ...n.prints]) {
+          const k = genericKey2(fold(p));
+          if (k !== undefined)
+            push(byGeneric, k, n);
+        }
       for (const h of n.headings ?? [])
         push(byHeading, fold(h), n);
       for (const r of n.runPrints ?? [])
@@ -7611,7 +7634,8 @@ function createPlaceReader2(options = {}) {
       phrases,
       listedPhrases,
       byHeading,
-      byRunPrint
+      byRunPrint,
+      byGeneric
     };
   }
   function idx() {
@@ -7834,7 +7858,13 @@ function createPlaceReader2(options = {}) {
       if (upper.length > 0)
         return { heads: upper, match: "code", truncated: false, refusal: null };
     }
+    const gk = generic ? genericKey2(folded) : undefined;
     const asPrint = keep(i.byPrint.get(folded));
+    if (gk !== undefined) {
+      for (const n of i.byGeneric.get(gk) ?? [])
+        if (!asPrint.includes(n))
+          asPrint.push(n);
+    }
     if (asPrint.length > 0) {
       const m = folded.includes(" ") ? "phrase" : "print";
       return { heads: asPrint, match: m, truncated: false, refusal: null };
@@ -8865,4 +8895,4 @@ function sameReading2(a, b) {
   return DEFAULT_PLACE_READER2.sameReading(a, b);
 }
 
-export { PLACE_NODES, NEVER_NAME, printZones, opensLocation, DEFAULT_PLACE_CAPACITY2, createPlaceReader2, DEFAULT_PLACE_READER2, place2, isPlaceToken2, countryCodeOf2, areAllPlaceTokens2, placeFromId2, placeWindows2, placeParts2, oireachtasOfRegion2, regionOfOireachtas2, placeStats2, resetPlaceCache2, placeRelation2, placesRelation2, probablySamePlace2, sameReading2 };
+export { PLACE_NODES, NEVER_NAME, printZones, opensLocation, GENERIC_WORDS2, genericKey2, DEFAULT_PLACE_CAPACITY2, createPlaceReader2, DEFAULT_PLACE_READER2, place2, isPlaceToken2, countryCodeOf2, areAllPlaceTokens2, placeFromId2, placeWindows2, placeParts2, oireachtasOfRegion2, regionOfOireachtas2, placeStats2, resetPlaceCache2, placeRelation2, placesRelation2, probablySamePlace2, sameReading2 };

package/dist/chunks/{place-3w1mr2vh.js → place-mpeps8tn.js}

@@ -26,6 +26,7 @@ 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 printsAdultCode2 = (phrase) => ADULT_CODE.test(phrase);
 var ADULT = /(?<!non[\s-])(?<!-)\b(?:adults?|advanced\s+adults?|masters?)\b/i;
 var SENIOR = /(?<!-)\bseniors?\b/i;
 var TITLE_RANGE_MIN2 = 3;
@@ -151,6 +152,10 @@ function ageTitleToken2(title) {
 }
 var ADULT_UNDER_MIN = 18;
 var SENIOR_ADULT_OVER = /\bsenior\s+adult\b/i;
+var SENIOR_ADULT_ENDS = new RegExp(`${SENIOR_ADULT_OVER.source}$`, "i");
+function readsSeniorAdult2(title, span) {
+  return SENIOR_ADULT_ENDS.test(title.slice(0, span.end));
+}
 function adultBeside2(band) {
   const b = band.trim().toLowerCase();
   if (b === "")
@@ -662,4 +667,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, TITLE_RANGE_MIN2, TITLE_RANGE_MAX2, ageTitleToken2, 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 { 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/chunks/{place-36esw9p7.js → place-y66f4138.js}

@@ -1,7 +1,7 @@
 import {
   Age2,
   ageRelation2
-} from "./place-3w1mr2vh.js";
+} from "./place-mpeps8tn.js";
 import {
   validity
 } from "./place-q9kwsmzd.js";