@finbheara/domain 0.30.0 → 0.32.0

package/dist/place.js

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

package/dist/schedule.js

@@ -0,0 +1,70 @@
+import"./chunks/place-8k74cr5j.js";
+import {
+  compTitle2,
+  matchTitle2
+} from "./chunks/place-bhedwqd1.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/school.js

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

package/dist/title.js

@@ -0,0 +1,19 @@
+import {
+  populationIn2,
+  roundNumbersIn2,
+  compTitle2,
+  populationRelation2,
+  titleRelation2,
+  ladderOf2,
+  matchTitle2
+} from "./chunks/place-bhedwqd1.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/geocode.d.ts

@@ -6,6 +6,7 @@ export interface GeocodeTown {
     readonly name: string;
     readonly cell: string;
     readonly geonameid: number;
+    readonly areas: readonly string[];
 }
 export declare function geocodeTowns(): ReadonlyMap<string, GeocodeTown>;
 export declare function geocode(print: string, ctx?: string | PlaceContext): Place;

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

@@ -1,3 +1,3 @@
-export declare const PLACE_TOWNS_TREE = "7766f91ef2cbbb099f93d878d1fd33d8b66bf6f3fe1a35590d0b5755f9a6dda6";
+export declare const PLACE_TOWNS_TREE = "f320d266e5d9119559361f4e961ffc2f49ac2158ba221015fa6b35a647471719";
 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 = "7766f91ef2cbbb099f93d878d1fd33d8b66bf6f3fe1a35590d0b5755f9a6dda6";
+export declare const PLACE_WITHIN_TREE = "f320d266e5d9119559361f4e961ffc2f49ac2158ba221015fa6b35a647471719";
 export declare const PLACE_WITHIN_SOURCES: Readonly<Record<string, string>>;
 export declare const PLACE_WITHIN: Readonly<Record<string, PlaceWithin>>;

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.30.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.32.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"],