@finbheara/domain 0.31.0 → 0.33.0

package/dist/chunks/place-fsxsxdhk.js

@@ -0,0 +1,139 @@
+import {
+  Age2,
+  ageRelation2
+} from "./place-8k74cr5j.js";
+import {
+  validity
+} from "./place-q9kwsmzd.js";
+
+import { toAscii } from "@finbheara/names/lexicon";
+var GIRLS_WORD = /\b(?:girls?|lad(?:y|ies)|wom[ae]ns?|cailini|mna)(?![a-z])/;
+var BOYS_WORD = /\b(?:boys?|mens?|man|gents?|gentlem[ae]n|buachailli|fir)(?![a-z])/;
+var MIXED_WORD = /\b(?:mixed|mix|meascaithe|measctha)\b/;
+function populationIn2(text) {
+  const w = toAscii(text).toLowerCase();
+  if (MIXED_WORD.test(w))
+    return "mixed";
+  const g = GIRLS_WORD.test(w);
+  const b = BOYS_WORD.test(w);
+  if (g && b)
+    return "mixed";
+  if (g)
+    return "girls";
+  if (b)
+    return "boys";
+  return "";
+}
+function roundNumbersIn2(folded, printed) {
+  const out = new Set;
+  for (const m of folded.matchAll(/ rounds? ((?:\d+ (?:and )?)+)/g))
+    for (const n of m[1].match(/\d+/g) ?? [])
+      out.add(Number(n));
+  for (const m of folded.matchAll(/ r([1-9])(?= )/g))
+    out.add(Number(m[1]));
+  if (printed)
+    for (const m of folded.matchAll(/ (\d) (?:st|nd|rd|th)(?= )/g))
+      out.add(Number(m[1]));
+  return out;
+}
+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|u|o)-(?=[ \t]*\d)/giu, "$1 ");
+function read(print, ctx, agePrint) {
+  const actx = { year: ctx.year ?? null, ...ctx.ladder ? { ladder: ctx.ladder } : {} };
+  let age;
+  let ageSpan = null;
+  if (agePrint !== undefined && agePrint.trim() !== "") {
+    age = Age2.from(agePrint, actx);
+  } else {
+    const t = Age2.fromTitle(spoken(print), actx);
+    age = t.age;
+    ageSpan = t.span;
+  }
+  const folded = roundFold(print);
+  const rounds = [...roundNumbersIn2(folded, / rounds? /.test(folded))].sort((a, b) => a - b);
+  const split = SPLIT.exec(folded);
+  const empty = print.trim() === "" && (agePrint ?? "").trim() === "";
+  const refusal = empty || age.isAge() ? null : "no-age";
+  return Object.freeze({
+    [Symbol.toStringTag]: "CompTitle",
+    ...validity(empty, refusal),
+    print,
+    age,
+    ageSpan,
+    population: populationIn2(print),
+    round: rounds.length === 1 ? rounds[0] : null,
+    rounds: Object.freeze(rounds),
+    split: split ? split[1] ?? split[2] : null,
+    isTitle: () => !empty && refusal === null
+  });
+}
+function compTitle2(print, ctx = {}) {
+  return read(print, ctx);
+}
+function populationRelation2(a, b) {
+  if (a === "" || b === "")
+    return "silent";
+  return a === b ? "same" : "disjoint";
+}
+function titleRelation2(a, b) {
+  const age = ageRelation2(a.age, b.age);
+  const population = populationRelation2(a.population, b.population);
+  const relation = population === "disjoint" || age.relation === "disjoint" ? "disjoint" : age.relation;
+  return Object.freeze({ relation, age, population });
+}
+function ladderOf2(bands) {
+  const caps = new Set;
+  const overs = new Set;
+  const ranges = [];
+  let adult = false;
+  for (const b of bands) {
+    const bare = Age2.from(b.ag0, { year: null });
+    if (!bare.isValid())
+      continue;
+    if (bare.isAdult())
+      adult = true;
+    const [p, q] = bare.parts;
+    if (bare.kind === "under" && p !== undefined)
+      caps.add(p);
+    else if (bare.kind === "over" && p !== undefined)
+      overs.add(p);
+    else if (bare.kind === "range" && p !== undefined && q !== undefined) {
+      caps.add(q);
+      ranges.push([p, q]);
+    }
+  }
+  const asc = (s) => [...s].sort((x, y) => x - y);
+  return Object.freeze({
+    caps: asc(caps),
+    overs: asc(overs),
+    ranges: ranges.sort((x, y) => x[0] - y[0] || x[1] - y[1]),
+    ...adult ? { adult: true } : {}
+  });
+}
+function matchTitle2(print, entries, ctx = {}) {
+  const bare = read(print, ctx);
+  const line = entries.filter((e) => populationRelation2(bare.population, populationIn2(e.title)) !== "disjoint");
+  const ladder = ladderOf2(line.map((e) => read(e.title, ctx, e.age).age));
+  const title = read(print, { ...ctx, ladder });
+  const hits = [];
+  if (title.isTitle())
+    for (const e of line) {
+      const r = titleRelation2(title, read(e.title, { ...ctx, ladder }, e.age));
+      if (r.relation === "same")
+        hits.push(e);
+    }
+  const split = title.split;
+  const same = split === null ? [] : hits.filter((e) => read(e.title, ctx, e.age).split === split);
+  const out = same.length > 0 ? same : hits;
+  return Object.freeze({
+    title,
+    entries: Object.freeze(out),
+    round: title.round,
+    isSingular: () => out.length === 1
+  });
+}
+
+export { populationIn2, roundNumbersIn2, compTitle2, populationRelation2, titleRelation2, ladderOf2, matchTitle2 };

package/dist/schedule.js

@@ -0,0 +1,70 @@
+import"./chunks/place-8k74cr5j.js";
+import {
+  compTitle2,
+  matchTitle2
+} from "./chunks/place-fsxsxdhk.js";
+
+function hallKey(hall) {
+  return hall.normalize("NFKD").replace(/\p{M}/gu, "").toLowerCase().replace(/[^a-z0-9]+/g, " ").trim();
+}
+function sameHall(a, b) {
+  const x = hallKey(a);
+  const y = hallKey(b);
+  if (x === "" || y === "")
+    return false;
+  if (x === y)
+    return true;
+  const [short, long] = x.length <= y.length ? [x, y] : [y, x];
+  return short.length >= 4 && long.endsWith(` ${short}`);
+}
+function scheduleAt(slots, where) {
+  const day = where.day ?? null;
+  const at = where.at ?? null;
+  return slots.filter((s) => sameHall(s.hall, where.hall) && (day === null || s.day === null || s.day === day) && (at === null || (s.start === null || s.start <= at) && (s.end === null || at < s.end)));
+}
+var ROUND_END = /\b(?:r ?\d|rounds? \d)(?: ?(?:&|and|,) ?(?:r ?)?\d)*\b/giu;
+function piecesOf(line) {
+  const out = [];
+  let from = 0;
+  for (const m of line.matchAll(ROUND_END)) {
+    const to = (m.index ?? 0) + m[0].length;
+    out.push(line.slice(from, to));
+    from = to;
+  }
+  out.push(line.slice(from));
+  return out.flatMap((p) => p.split(",")).filter((p) => p.trim() !== "");
+}
+function readRunningOrder(text, entries, where, ctx = {}) {
+  const out = [];
+  const seen = new Set;
+  for (const line of text.split(/[\n;]+/)) {
+    let population = "";
+    for (const piece of piecesOf(line)) {
+      const own = compTitle2(piece, ctx).population;
+      if (own !== "")
+        population = own;
+      const said = own === "" && population !== "" ? `${piece} ${population}` : piece;
+      const m = matchTitle2(said, entries, ctx);
+      for (const entry of m.entries) {
+        const key = `${entries.indexOf(entry)}|${m.round}`;
+        if (seen.has(key))
+          continue;
+        seen.add(key);
+        out.push(Object.freeze({
+          hall: where.hall,
+          day: where.day ?? null,
+          start: null,
+          end: null,
+          entry,
+          round: m.round
+        }));
+      }
+    }
+  }
+  return out;
+}
+export {
+  readRunningOrder,
+  sameHall,
+  scheduleAt
+};

package/dist/title.js

@@ -0,0 +1,19 @@
+import {
+  populationIn2,
+  roundNumbersIn2,
+  compTitle2,
+  populationRelation2,
+  titleRelation2,
+  ladderOf2,
+  matchTitle2
+} from "./chunks/place-fsxsxdhk.js";
+import"./chunks/place-8k74cr5j.js";
+export {
+  compTitle2 as compTitle,
+  ladderOf2 as ladderOf,
+  matchTitle2 as matchTitle,
+  populationIn2 as populationIn,
+  populationRelation2 as populationRelation,
+  roundNumbersIn2 as roundNumbersIn,
+  titleRelation2 as titleRelation
+};

package/dist/types/schedule.d.ts

@@ -0,0 +1,21 @@
+import { type SyllabusEntry, type TitleContext } from "./title.ts";
+export type { SyllabusEntry, TitleContext } from "./title.ts";
+export interface ScheduleSlot<E> {
+    readonly hall: string;
+    readonly day: number | null;
+    readonly start: number | null;
+    readonly end: number | null;
+    readonly entry: E;
+    readonly round: number | null;
+}
+export interface ScheduleWhere {
+    readonly hall: string;
+    readonly day?: number | null;
+    readonly at?: number | null;
+}
+export declare function sameHall(a: string, b: string): boolean;
+export declare function scheduleAt<E>(slots: readonly ScheduleSlot<E>[], where: ScheduleWhere): ScheduleSlot<E>[];
+export declare function readRunningOrder<E extends SyllabusEntry>(text: string, entries: readonly E[], where: {
+    readonly hall: string;
+    readonly day?: number | null;
+}, ctx?: Omit<TitleContext, "ladder">): ScheduleSlot<E>[];

package/dist/types/title.d.ts

@@ -0,0 +1,45 @@
+import type { AgeTitleSpan } from "./age-title.ts";
+import { Age, type AgeComparison, type AgeLadder, type AgeRelation } from "./age.ts";
+import { type Validated } from "./validated.ts";
+export type { EmptyReason, Validated } from "./validated.ts";
+export type { AgeComparison, AgeLadder } from "./age.ts";
+export type Population = "girls" | "boys" | "mixed";
+export declare function populationIn(text: string): Population | "";
+export declare function roundNumbersIn(folded: string, printed: boolean): Set<number>;
+export interface TitleContext {
+    readonly year?: number | null;
+    readonly ladder?: AgeLadder;
+}
+export type TitleRefusal = "no-age";
+export interface CompTitle extends Validated<TitleRefusal> {
+    readonly [Symbol.toStringTag]: "CompTitle";
+    readonly print: string;
+    readonly age: Age;
+    readonly ageSpan: AgeTitleSpan | null;
+    readonly population: Population | "";
+    readonly round: number | null;
+    readonly rounds: readonly number[];
+    readonly split: string | null;
+    isTitle(): boolean;
+}
+export declare function compTitle(print: string, ctx?: TitleContext): CompTitle;
+export type PopulationRelation = "same" | "disjoint" | "silent";
+export interface TitleComparison {
+    readonly relation: AgeRelation;
+    readonly age: AgeComparison;
+    readonly population: PopulationRelation;
+}
+export declare function populationRelation(a: Population | "", b: Population | ""): PopulationRelation;
+export declare function titleRelation(a: CompTitle, b: CompTitle): TitleComparison;
+export declare function ladderOf(bands: readonly Age[]): AgeLadder;
+export interface SyllabusEntry {
+    readonly title: string;
+    readonly age?: string;
+}
+export interface TitleMatch<E extends SyllabusEntry> {
+    readonly title: CompTitle;
+    readonly entries: readonly E[];
+    readonly round: number | null;
+    isSingular(): boolean;
+}
+export declare function matchTitle<E extends SyllabusEntry>(print: string, entries: readonly E[], ctx?: Omit<TitleContext, "ladder">): TitleMatch<E>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.31.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",
+	"version": "0.33.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",
 		"regions",
@@ -65,6 +65,14 @@
 			"types": "./dist/types/person.d.ts",
 			"default": "./dist/person.js"
 		},
+		"./title": {
+			"types": "./dist/types/title.d.ts",
+			"default": "./dist/title.js"
+		},
+		"./schedule": {
+			"types": "./dist/types/schedule.d.ts",
+			"default": "./dist/schedule.js"
+		},
 		"./package.json": "./package.json"
 	},
 	"files": ["dist/*.js", "dist/chunks/*.js", "dist/types/**/*.d.ts", "README.md", "LICENSE"],
@@ -82,5 +90,8 @@
 	},
 	"dependencies": {
 		"@finbheara/names": "0.20.0"
+	},
+	"devDependencies": {
+		"typescript": "7.0.2"
 	}
 }