@finbheara/domain 0.35.0 → 0.36.0

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 };

package/dist/schedule.js

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

package/dist/title.js

@@ -6,8 +6,8 @@ import {
   titleRelation2,
   ladderOf2,
   matchTitle2
-} from "./chunks/place-fsxsxdhk.js";
-import"./chunks/place-8k74cr5j.js";
+} from "./chunks/place-36esw9p7.js";
+import"./chunks/place-3w1mr2vh.js";
 export {
   compTitle2 as compTitle,
   ladderOf2 as ladderOf,

package/dist/types/age-title.d.ts

@@ -1,3 +1,4 @@
+export declare const printsUnderOpen: (print: string) => boolean;
 export declare const TITLE_RANGE_MIN = 3;
 export declare const TITLE_RANGE_MAX = 40;
 export interface AgeTitleSpan {

package/dist/types/age-types.d.ts

@@ -23,7 +23,7 @@ export interface AgeContext {
 }
 export type AgeArm = "band" | "yob" | "open" | "empty";
 export type AgeKind = "under" | "over" | "range" | "adult" | "senior" | "yob";
-export type AgeRefusal = "not-a-band" | "backwards-range" | "overlapping-ranges" | "senior-without-ladder" | "below-youngest-band" | "year-out-of-range";
+export type AgeRefusal = "not-a-band" | "backwards-range" | "overlapping-ranges" | "senior-without-ladder" | "below-youngest-band" | "above-oldest-band" | "year-out-of-range";
 export type AgeSource = "sibling-narrowed" | "printed-band" | "printed-range" | "printed-yob" | "open";
 export type AgeClause = "under-floored-on-rung" | "under-stride" | "youngest-absorbs" | "over-ceiling-from-next-over" | "over-ceiling-refused-gap" | "and-over-no-ceiling" | "adult-under-ceiling" | "adult-band" | "range-overlapping" | "range-as-under" | "range-top-meets-over" | "range-adult-floor";
 export type AgeRelation = "same" | "contains" | "overlaps" | "disjoint" | "silent";

package/dist/types/age.d.ts

@@ -1,7 +1,7 @@
 import { type AgeTitleSpan } from "./age-title.ts";
 import type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, AgeSpan, BirthYears, YOBContext, YoungFloorVerdict } from "./age-types.ts";
 import { type EmptyReason, type Validated } from "./validated.ts";
-export { type AgeTitleSpan, type AgeTitleToken, TITLE_RANGE_MAX, TITLE_RANGE_MIN, adultBeside, ageTitleToken, } from "./age-title.ts";
+export { type AgeTitleSpan, type AgeTitleToken, TITLE_RANGE_MAX, TITLE_RANGE_MIN, adultBeside, ageTitleToken, printsUnderOpen, } from "./age-title.ts";
 export type { AgeArm, AgeClause, AgeComparison, AgeContext, AgeInterval, AgeKind, AgeLadder, AgeMisuse, AgeRefusal, AgeRelation, AgeRelationReason, AgeSource, AgeSpan, BirthYears, EmptyReason, Validated, YOBContext, YoungFloorVerdict, };
 export declare const YOUNGEST_FLOOR = 0;
 export declare const ADULT_FLOOR = 18;
@@ -18,6 +18,7 @@ export declare const YOUNG_FLOOR: Readonly<{
 export declare const MIN_MAJOR_AGE = 4;
 export declare const MIN_FEIS_AGE = 3;
 export declare const YOUNGEST_BAND_TOP = 3;
+export declare const OLDEST_BAND_FLOOR = 100;
 export declare const YOB_RANGE: Readonly<{
     readonly first: 1901;
     readonly last: 2099;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.35.0",
+	"version": "0.36.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",
@@ -89,7 +89,7 @@
 		"prepublishOnly": "bun scripts/build.ts && bun scripts/guard-tarball.ts"
 	},
 	"dependencies": {
-		"@finbheara/names": "0.20.0"
+		"@finbheara/names": "0.21.0"
 	},
 	"devDependencies": {
 		"typescript": "7.0.2"