@finbheara/domain 0.34.0 → 0.36.0

package/README.md

@@ -133,15 +133,21 @@ geocode("Prague", { near: "RCCEA", declared: true }).isPlace();
                                  // no namesake town is read
 geocode("Fife").isPlace();       // false: a town of Washington, and a council area
                                  // of Scotland
+geocode("Prague").isPlace();     // false: a town of Oklahoma, and the capital of
+                                 // Czechia
+geocode("Prague, Oklahoma").pl3; // "USA-OK/prague"
 ```
 
 The layer reads a bare town by its name alone, so it reads one only where nothing contradicts
 it. A context (a `country` or `near`, read by the store, never as a town of the layer) that
 reads to ONE place which neither holds the town nor shares its country stops the layer: `Prague`
 near `RCCEA` and `Whitecross` under `Ireland` and `Ulster` read nothing. A context the store
-reads nothing for, or reads as several places, stops nothing, so with no context
-`geocode("Prague")` is still Prague, Oklahoma. A town named like a GeoNames admin2 area of those
-six countries that does not hold it (`Fife`) reads only where a context places it. A print with a
+reads nothing for, or reads as several places, stops nothing. A town named like a GeoNames admin2
+area of those six countries that does not hold it (`Fife`) reads only where a qualifier or a
+context places it. So does a town named like a capital or a major city elsewhere (a `cities500`
+place outside the six countries that is a capital or holds a million people, and is more populous
+than the town): bare `Prague` and `Copenhagen` read nothing, where they would read the towns of
+Oklahoma and New York, and `Prague` in a USA context is the Oklahoma town. A print with a
 qualifier (`Yonkers, NY`) is never stopped: the context never overrules the print.
 
 A `Place` is one of four arms: `resolved`, `plural` (a print naming more than one place),

package/dist/age.js

@@ -1,4 +1,5 @@
 import {
+  printsUnderOpen2,
   TITLE_RANGE_MIN2,
   TITLE_RANGE_MAX2,
   ageTitleToken2,
@@ -12,6 +13,7 @@ import {
   MIN_MAJOR_AGE2,
   MIN_FEIS_AGE2,
   YOUNGEST_BAND_TOP2,
+  OLDEST_BAND_FLOOR2,
   YOB_RANGE2,
   DANCE_UP_YEARS2,
   ageOnJanuary12,
@@ -35,7 +37,7 @@ import {
   youngFloor2,
   tooYoungForMajor2,
   tooYoungForFeis2
-} from "./chunks/place-8k74cr5j.js";
+} from "./chunks/place-3w1mr2vh.js";
 export {
   ADULT_FLOOR2 as ADULT_FLOOR,
   AVERAGE_AGE_DECIMALS2 as AVERAGE_AGE_DECIMALS,
@@ -45,6 +47,7 @@ export {
   MAJORS_FLOOR_YEARS2 as MAJORS_FLOOR_YEARS,
   MIN_FEIS_AGE2 as MIN_FEIS_AGE,
   MIN_MAJOR_AGE2 as MIN_MAJOR_AGE,
+  OLDEST_BAND_FLOOR2 as OLDEST_BAND_FLOOR,
   TITLE_RANGE_MAX2 as TITLE_RANGE_MAX,
   TITLE_RANGE_MIN2 as TITLE_RANGE_MIN,
   UNDER_CAP2 as UNDER_CAP,
@@ -64,6 +67,7 @@ export {
   canOverlap2 as canOverlap,
   intersectBirthYears2 as intersectBirthYears,
   isAveraged2 as isAveraged,
+  printsUnderOpen2 as printsUnderOpen,
   roundedMeanHundredths2 as roundedMeanHundredths,
   tooYoungForFeis2 as tooYoungForFeis,
   tooYoungForMajor2 as tooYoungForMajor,

package/dist/chunks/{place-fsxsxdhk.js → place-36esw9p7.js}

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

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

@@ -13,6 +13,8 @@ var UNDER = new RegExp(String.raw`${UNDER_WORD}(\d{1,2})(?![0-9])(?![a-z][a-z0-9
 var JOINED_CAPS = new RegExp(String.raw`${UNDER_WORD}\d{1,2}(?![0-9])(?:(?:\s*(?:&|,|\/|\band\b)\s*(?:${UNDER_WORD})?|\s+${UNDER_WORD})\d{1,2}(?![0-9]))+`, "i");
 var JOINED_NOT = /^(?:\s*(?:yrs?|years?|-?\s*hand)\b|[a-z])/i;
 var JOINED_OPEN = /^(?:\s*\+|\s*(?:&|and)\s*(?:o|over|older|up)\b)/i;
+var UNDER_OPEN = new RegExp(String.raw`${UNDER_WORD}\d{1,2}(?![0-9])\s*(?:&|\band\b)\s*(?:o|over|older|up)\b`, "i");
+var printsUnderOpen2 = (print) => UNDER_OPEN.test(print);
 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;
@@ -60,6 +62,8 @@ function readAnchored(title, s, offset, aside = false) {
   const joined = readJoined(title, s, offset);
   if (joined !== null)
     return joined;
+  if (UNDER_OPEN.test(s))
+    return NONE;
   for (const re of [AND_OVER, OVER_WORD, OVER_GLUED]) {
     const m = re.exec(s);
     if (m?.[1] !== undefined)
@@ -188,6 +192,7 @@ var YOUNG_FLOOR2 = Object.freeze({ hard: 2, soft: 4 });
 var MIN_MAJOR_AGE2 = 4;
 var MIN_FEIS_AGE2 = 3;
 var YOUNGEST_BAND_TOP2 = MAJORS_FLOOR_YEARS2;
+var OLDEST_BAND_FLOOR2 = 100;
 var YOB_RANGE2 = Object.freeze({ first: 1901, last: 2099 });
 var DANCE_UP_YEARS2 = 1;
 var ageOnJanuary12 = (year, born) => year - born - 1;
@@ -347,6 +352,11 @@ function refuseBelowYoungest(r) {
     return r;
   return { ...r, interval: null, refusal: "below-youngest-band", clauses: [] };
 }
+function refuseAboveOldest(r) {
+  if (r.interval === null || r.interval.lo < OLDEST_BAND_FLOOR2)
+    return r;
+  return { ...r, interval: null, refusal: "above-oldest-band", clauses: [] };
+}
 
 class AgeMisuseError2 extends Error {
   misuse;
@@ -377,7 +387,7 @@ function fromPrint(print, context = {}) {
   const ladder = context.ladder ?? NO_LADDER;
   const year = context.year === undefined ? currentYear() : context.year;
   const ag1 = print.trim().toLowerCase();
-  const reading = ag1 === "" ? { kind: null, interval: null, refusal: null, clauses: [], parts: [] } : refuseBelowYoungest(read(print.trim(), ladder, context.top === true));
+  const reading = ag1 === "" ? { kind: null, interval: null, refusal: null, clauses: [], parts: [] } : refuseAboveOldest(refuseBelowYoungest(read(print.trim(), ladder, context.top === true)));
   const iv = reading.interval;
   const arm = ag1 === "" ? "empty" : iv === null ? "open" : "band";
   const ag2 = iv !== null ? display(iv) : ag1 === "" ? "" : `${ag1}?`;
@@ -652,4 +662,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 { 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, 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, 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 };