@finbheara/domain 0.32.0 → 0.34.0

package/README.md

@@ -100,6 +100,7 @@ p.region;                    // "IDTANA-MARO"
 
 place("Calgary, AB").pl2;    // "CAN-AB/calgary"
 place("Co. Cork").region;    // "MUNSTER"
+place("Co. Louth").region;   // "ULSTER": the council that runs it, not its province
 place("CA").arm;             // "ambiguous": California or Canada
 place("Dublin").arm;         // "ambiguous": Ireland, California or Ohio
 
@@ -169,6 +170,10 @@ resolvePhrase("Derry in Ireland");                  // ["ULSTER"]
 `resolvePhrase` answers every region a phrase supports, and `[]` where it supports none. A
 token that names places in two regions resolves only with a co-token that settles it.
 
+A region is always the CLRG council that runs a place, and never its province or state where
+the two differ. County Louth lies in the province of Leinster and is run by the Ulster council,
+so it reads `ULSTER`, as Northern Ireland reads `ULSTER` and Wales `ENG_MIDLANDS`.
+
 ## Read a school name
 
 ```ts
@@ -406,6 +411,9 @@ compTitle("Girls Under 13 B").split;             // "b"
 compTitle("Treble Reel Special").invalidReason(); // "no-age"
 ```
 
+A spoken dash is read as a space: `boys u-17`, `Boys U-17` and `boys u- 17` read as `boys u17`,
+`girls o-16` as `girls o16`, and `under-15` as `under 15`.
+
 A band split into parallel competitions (`Girls Under 13 A`, `Girls Under 13 B`) answers every
 split, unless the title prints the letter. A title naming no band names nothing. Hand in the
 entries of the kind you mean: a solo championship's ages are often a team event's too.

package/dist/chunks/{place-6qvca8eg.js → place-75ms9pvh.js}

@@ -4030,7 +4030,7 @@ var PLACE_NODES = [
     kind: "subdivision",
     name: "Louth",
     geo: "IRL",
-    admin: "LEINSTER",
+    admin: "ULSTER",
     prints: ["co louth", "county louth", "louth"],
     codes: ["IE-LH"]
   },

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

@@ -40,7 +40,7 @@ function roundFold(print) {
   return ` ${toAscii(print).toLowerCase().replace(/(\d)(\p{L})/gu, "$1 $2").replace(/[-–—,/()&+:;|.']/g, " ").replace(/\s+/g, " ").trim()} `;
 }
 var SPLIT = / ([a-d]) $|(?:\d|girls?|boys?|lad(?:y|ies)|m[ae]n|mixed) ([a-d])(?= )/;
-var spoken = (print) => print.replace(/\b(under|over)-(?=\d)/giu, "$1 ");
+var spoken = (print) => print.replace(/\b(under|over|u|o)-(?=[ \t]*\d)/giu, "$1 ");
 function read(print, ctx, agePrint) {
   const actx = { year: ctx.year ?? null, ...ctx.ladder ? { ladder: ctx.ladder } : {} };
   let age;

package/dist/clrg-regions.js

@@ -201,7 +201,6 @@ var IE_COUNTIES = {
   kilkenny: "LEINSTER",
   laois: "LEINSTER",
   longford: "LEINSTER",
-  louth: "LEINSTER",
   meath: "LEINSTER",
   offaly: "LEINSTER",
   westmeath: "LEINSTER",
@@ -221,6 +220,7 @@ var IE_COUNTIES = {
   fermanagh: "ULSTER",
   londonderry: "ULSTER",
   derry: "ULSTER",
+  louth: "ULSTER",
   monaghan: "ULSTER",
   tyrone: "ULSTER"
 };

package/dist/geocode.js

@@ -5,7 +5,7 @@ import {
   place2,
   placeFromId2,
   placeParts2
-} from "./chunks/place-6qvca8eg.js";
+} from "./chunks/place-75ms9pvh.js";
 
 var PLACE_TOWNS = {
   "AUS-ACT": "Acton~~r3dp~9973368|Ainslie~~r3dp~8348552|Amaroo~~r3dp~8349331|Aranda~~r3dp~8349333|Banks~~r3dn~8348388|Barton~~r3dp~8349163|Belconnen~~r3dp~2176373|Bonner~~r3dp~9973375|Bonython~~r3dn~8349164|Braddon~~r3dp~8349165|Bruce~~r3dp~8349301|Calwell~~r3dn~8347865|Campbell~~r3dp~2172618|Canberra City~~r3dp~8347868|Casey~~r3dp~8349161~AU.07.21610|Chapman~~r39y~8349166|Charnwood~~r39z~8349169|Chifley~~r3dn~8348372|Chisholm~~r3dn~8349303|Conder~~r3dn~8349167|Cook~~r3dp~8347746~AU.04.32500|Coombs~~r39z~9973426|Crace~~r3dp~8349353|Curtin~~r3dp~8349171|Deakin~~r3dp~8349172|Dickson~~r3dp~8348400|Downer~~r3dp~8348308|Duffy~~r39y~8349425|Dunlop~~r39z~8349173|Evatt~~r3dp~8349175|Fadden~~r3dn~8348126|Farrer~~r3dn~8347869|Fisher~~r39y~8349304~CA.03.5953379|Florey~~r39z~8349174|Flynn~~r39z~8349305|Forde~~r3dp~8347874|Forrest~~r3dp~8504554|Franklin~~r3dp~8349306|Fraser~~r39z~8348647|Garran~~r3dn~9973428|Gilmore~~r3dn~8349400|Giralang~~r3dp~8348680|Gordon~~r3dn~8348660|Gowrie~~r3dn~8348892|Greenway~~r3dn~8349176|Griffith~~r3dp~8349307~AU.02.13450|Gungahlin~~r3dp~8349178|Hackett~~r3dp~8349180|Harrison~~r3dp~8349179|Hawker~~r39z~8349385|Higgins~~r39z~8349181|Holder~~r39y~8349308|Holt~~r39z~8347705|Hughes~~r3dn~8349446|Isaacs~~r3dn~8349182|Isabella Plains~~r3dn~8349183|Jacka~~r3dp~9973376|Jervis Bay Village~~r3g0~2162322|Kaleen~~r3dp~6619483|Kambah~~r39y~8348370|Kingston~~r3dp~8349299|Latham~~r39z~8349309|Lyneham~~r3dp~8347876|Lyons~~r3dn~8349159|Macarthur~~r3dn~7302189|Macgregor~~r39z~8348907|Macquarie~~r3dp~7281844|Mawson~~r3dn~8348684|McKellar~~r3dp~8349184|Melba~~r39z~8349186|Monash~~r3dn~8349310~AU.07.24970|Narrabundah~~r3dn~8349435|Ngunnawal~~r3dp~8349187|Nicholls~~r3dp~8349185|O'Connor~~r3dp~8348190|O'Malley~~r3dn~8349436|Oxley~~r3dn~8349413|Page~~r39z~8348129|Palmerston~~r3dp~8349170~AU.03.72800|Pearce~~r3dn~8349379|Phillip~~r3dn~2153335|Red Hill~~r3dp~9973374|Reid~~r3dp~8348371|Richardson~~r3dn~8349188|Rivett~~r39y~8349189|Scullin~~r39z~8349327|Spence~~r3dp~8349313|Stirling~~r39y~8349380~AU.08.57910,CA.01.4802009,GB.SCT.W6|Symonston~~r3dn~8349190|Theodore~~r3dn~8348420~CA.11.4709028|Torrens~~r3dn~8348973|Tuggeranong~~r3dn~2145936|Turner~~r3dp~8348040|Wanniassa~~r3dn~8349191|Waramanga~~r39y~8349192|Watson~~r3dp~8348373~CA.11.4710062|Weetangera~~r39z~2144224|Weston~~r39y~8349397|Wright~~r39z~9973427|Yarralumla~~r3dp~8348374",

package/dist/place.js

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

package/dist/schedule.js

@@ -2,7 +2,7 @@ import"./chunks/place-8k74cr5j.js";
 import {
   compTitle2,
   matchTitle2
-} from "./chunks/place-bhedwqd1.js";
+} from "./chunks/place-fsxsxdhk.js";
 
 function hallKey(hall) {
   return hall.normalize("NFKD").replace(/\p{M}/gu, "").toLowerCase().replace(/[^a-z0-9]+/g, " ").trim();

package/dist/school.js

@@ -12,7 +12,7 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-6qvca8eg.js";
+} from "./chunks/place-75ms9pvh.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";

package/dist/title.js

@@ -6,7 +6,7 @@ import {
   titleRelation2,
   ladderOf2,
   matchTitle2
-} from "./chunks/place-bhedwqd1.js";
+} from "./chunks/place-fsxsxdhk.js";
 import"./chunks/place-8k74cr5j.js";
 export {
   compTitle2 as compTitle,

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

@@ -1,3 +1,3 @@
-export declare const PLACE_TOWNS_TREE = "f320d266e5d9119559361f4e961ffc2f49ac2158ba221015fa6b35a647471719";
+export declare const PLACE_TOWNS_TREE = "96572b07e0a2d0d2bdc02ee6909a2ae4b9106c63908be665f6b50eeb8651411b";
 export declare const PLACE_TOWNS_SOURCES: Readonly<Record<string, string>>;
 export declare const PLACE_TOWNS: Readonly<Record<string, string>>;

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

@@ -1,4 +1,4 @@
 import type { PlaceWithin } from "./place-types.ts";
-export declare const PLACE_WITHIN_TREE = "f320d266e5d9119559361f4e961ffc2f49ac2158ba221015fa6b35a647471719";
+export declare const PLACE_WITHIN_TREE = "96572b07e0a2d0d2bdc02ee6909a2ae4b9106c63908be665f6b50eeb8651411b";
 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.32.0",
+	"version": "0.34.0",
 	"description": "Places, CLRG regions, school names, ages, dances, competition titles and schedules, and a person's print in its role, as they are printed: read, compared and told apart",
 	"keywords": [
 		"places",
@@ -90,5 +90,8 @@
 	},
 	"dependencies": {
 		"@finbheara/names": "0.20.0"
+	},
+	"devDependencies": {
+		"typescript": "7.0.2"
 	}
 }