@finbheara/domain 0.22.0 → 0.24.0

package/dist/age.js

@@ -8,7 +8,11 @@ var AND_OVER = /(?<![0-9])(?<![0-9][a-z]*)(?<!(?:^|[^a-z0-9])[a-z])(\d{1,2})\s*(
 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*(?:age\s*)?|\bfaoi\s*|(?<![a-z0-9])u\.?\s*)(\d{1,2})(?![0-9])(?![a-z][a-z0-9])/i;
+var UNDER_WORD = String.raw`(?:\bund(?:er)?\.?\s*(?:age\s*)?|\bfaoi\s*|(?<![a-z0-9])u[./]?\s*)`;
+var UNDER = new RegExp(String.raw`${UNDER_WORD}(\d{1,2})(?![0-9])(?![a-z][a-z0-9])`, "i");
+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_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;
@@ -37,7 +41,25 @@ function inFence(a, b) {
   const hi = Number(b);
   return lo >= TITLE_RANGE_MIN && hi <= TITLE_RANGE_MAX && lo < hi;
 }
+function readJoined(title, s, offset) {
+  const j = JOINED_CAPS.exec(s);
+  if (j === null)
+    return null;
+  const end = j.index + j[0].length;
+  const tail = s.slice(end);
+  if (JOINED_NOT.test(tail))
+    return null;
+  const caps = [...j[0].matchAll(/\d{1,2}/g)].map((d) => Number(d[0]));
+  if (caps.some((c, i) => i > 0 && c < (caps[i - 1] ?? 0)))
+    return null;
+  if (JOINED_OPEN.test(tail))
+    return NONE;
+  return at(title, offset, j.index, end, `u${Math.max(...caps)}`);
+}
 function readAnchored(title, s, offset, aside = false) {
+  const joined = readJoined(title, s, offset);
+  if (joined !== null)
+    return joined;
   for (const re of [AND_OVER, OVER_WORD, OVER_GLUED]) {
     const m = re.exec(s);
     if (m?.[1] !== undefined)

package/dist/chunks/{place-qe5krdev.js → place-g3py4821.js}

@@ -4167,6 +4167,15 @@ var PLACE_NODES = [
     prints: ["co wexford", "county wexford", "wexford"],
     codes: ["IE-WX"]
   },
+  {
+    id: "MEX-CMX",
+    kind: "subdivision",
+    name: "Ciudad de México",
+    geo: "MEX",
+    admin: null,
+    prints: ["ciudad de mexico", "mexico city"],
+    codes: ["MX-CMX"]
+  },
   {
     id: "MEX-QUE",
     kind: "subdivision",
@@ -5936,6 +5945,15 @@ var PLACE_NODES = [
     prints: ["baton rouge"],
     codes: []
   },
+  {
+    id: "USA-LA/kenner",
+    kind: "city",
+    name: "Kenner",
+    geo: "USA-LA",
+    admin: "IDTANA-SRO",
+    prints: ["kenner"],
+    codes: []
+  },
   {
     id: "USA-LA/new-orleans",
     kind: "city",
@@ -6920,6 +6938,15 @@ var PLACE_NODES = [
     admin: "IDTANA-MAO",
     prints: ["milwaukee"],
     codes: []
+  },
+  {
+    id: "USA-WI/new-berlin",
+    kind: "city",
+    name: "New Berlin",
+    geo: "USA-WI",
+    admin: "IDTANA-MAO",
+    prints: ["new berlin"],
+    codes: []
   }
 ];
 
@@ -7094,6 +7121,7 @@ var PLACE_WITHIN = {
   "USA-KY/lexington": { nodes: [], names: ["Fayette", "Fayette County", "Kentucky"] },
   "USA-KY/louisville": { nodes: [], names: ["Jefferson", "Jefferson County", "Kentucky"] },
   "USA-LA/baton-rouge": { nodes: [], names: ["East Baton Rouge Parish", "Louisiana"] },
+  "USA-LA/kenner": { nodes: [], names: ["Jefferson Parish", "Louisiana"] },
   "USA-LA/new-orleans": { nodes: [], names: ["Louisiana", "Orleans Parish"] },
   "USA-MA/boston": { nodes: [], names: ["Massachusetts", "Suffolk", "Suffolk County"] },
   "USA-MA/lexington": { nodes: [], names: ["Massachusetts", "Middlesex", "Middlesex County"] },
@@ -7211,7 +7239,8 @@ var PLACE_WITHIN = {
   "USA-WA/spokane": { nodes: [], names: ["Spokane", "Spokane County", "Washington"] },
   "USA-WA/tacoma": { nodes: [], names: ["Pierce", "Pierce County", "Washington"] },
   "USA-WI/madison": { nodes: [], names: ["Dane", "Dane County", "Wisconsin"] },
-  "USA-WI/milwaukee": { nodes: [], names: ["Milwaukee", "Milwaukee County", "Wisconsin"] }
+  "USA-WI/milwaukee": { nodes: [], names: ["Milwaukee", "Milwaukee County", "Wisconsin"] },
+  "USA-WI/new-berlin": { nodes: [], names: ["Waukesha", "Waukesha County", "Wisconsin"] }
 };
 
 var QUALIFIER_DELIMITER = /[,;:()[\]/–—-]/;

package/dist/place.js

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

package/dist/school.js

@@ -12,7 +12,7 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-qe5krdev.js";
+} from "./chunks/place-g3py4821.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";

package/dist/types/place-within.d.ts

@@ -1,4 +1,4 @@
 import type { PlaceWithin } from "./place-types.ts";
-export declare const PLACE_WITHIN_TREE = "42be759c4de3678a3d22fc5174dbafad342c5437ec8fd8e2f05cd8b0a37660bf";
+export declare const PLACE_WITHIN_TREE = "feeb35d256fbe6db963f6754bf34a706994922fde0492bc01ec3e152a4bcf891";
 export declare const PLACE_WITHIN_SOURCES: Readonly<Record<string, string>>;
 export declare const PLACE_WITHIN: Readonly<Record<string, PlaceWithin>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.22.0",
+	"version": "0.24.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",