@finbheara/domain 0.12.0 → 0.13.1

package/README.md

@@ -105,7 +105,7 @@ A `Place` is one of four arms: `resolved`, `plural` (a print naming more than on
 says they cannot be one place; `same`, `contains` and `overlaps` do not.
 
 A print that is clearly not a place is refused, with its reason: a placeholder
-(`[address withheld]`, `Other`), a URL anywhere in the print (`web`), an online event in the
+(`[address withheld]`, `TBA`), a URL anywhere in the print (`web`), an online event in the
 venue field (`online`), a change-of-venue notice (`notice`), or a replacement character where
 the source lost bytes (`damaged`). These are asked only where the store reads nothing, so a
 refusal never takes a reading away. Mojibake that can be decoded back is not refused: repair it
@@ -171,7 +171,8 @@ compareSchoolNames("Ardvarna Academy", "Ardvarna Academy (Ontario)", reader);
 ### Your own garbage
 
 The shipped refusals are generic: a card number, keyboard filler, a run with no letter in it,
-the shared placeholder list of `@finbheara/names` (`N/A`, `No School`, ...). What YOUR data
+what a school cell prints where no school was entered (`N/A`, `No School`, `-- Choose One --`,
+...). What YOUR data
 prints in a school field and is not a school, such as an entry system's own "school not
 listed" instruction, a test entry, or a note typed into the wrong field, is yours to declare.
 Pass it as `garbage`, the same idea as `phraseClassifier(lexicon, { garbageVocab })` in

package/dist/chunks/{place-jksxqsqb.js → place-sa6438qr.js}

@@ -1,9 +1,11 @@
+import {
+  SHARED_ROW_SENTINELS2,
+  sentinelIn2
+} from "./place-tcgfvemw.js";
 import {
   validity
 } from "./place-q9kwsmzd.js";
 
-import { isPlaceholderPrint } from "@finbheara/names/normalize";
-
 var PLACE_NODES = [
   {
     id: "world",
@@ -6781,6 +6783,8 @@ function inWebSpan(at, index) {
 }
 
 var DEFAULT_PLACE_CAPACITY2 = 8192;
+var PLACE_CELL_SENTINELS = [...SHARED_ROW_SENTINELS2];
+var placeCellSentinelOf = sentinelIn2(PLACE_CELL_SENTINELS);
 function createPlaceReader2(options = {}) {
   const nodes = options.tree ?? PLACE_NODES;
   let index;
@@ -6822,7 +6826,7 @@ function createPlaceReader2(options = {}) {
       return "online";
     if (folded === NOTICE || folded.startsWith(`${NOTICE} `))
       return "notice";
-    if (isPlaceholderPrint(raw))
+    if (placeCellSentinelOf(raw) !== undefined)
       return "placeholder";
     return;
   }
@@ -6939,9 +6943,11 @@ function createPlaceReader2(options = {}) {
       ancestorsOf.set(n.id, out);
     }
     const phrases = [...byPrint.keys()].filter((k) => k.includes(" ")).sort((a, b) => b.length - a.length);
+    const printsSorted = [...byPrint.keys()].map((k, i) => [k, i]).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
     return {
       byId,
       byPrint,
+      printsSorted,
       byCode,
       byTruncation,
       byCountryCode,
@@ -7186,13 +7192,32 @@ function createPlaceReader2(options = {}) {
   function completions(folded) {
     if (folded.length < MIN_STEM)
       return [];
+    const i = idx();
+    const sorted = i.printsSorted;
+    let lo = 0;
+    let hi = sorted.length;
+    while (lo < hi) {
+      const mid = lo + hi >>> 1;
+      if (sorted[mid][0] < folded)
+        lo = mid + 1;
+      else
+        hi = mid;
+    }
+    const run = [];
+    for (let k = lo;k < sorted.length; k++) {
+      const at = sorted[k];
+      if (!at[0].startsWith(folded))
+        break;
+      run.push(at);
+    }
+    run.sort((a, b) => a[1] - b[1]);
     const out = [];
-    for (const [key, found] of idx().byPrint) {
-      if (key.length <= folded.length || !key.startsWith(folded))
+    for (const [key] of run) {
+      if (key.length <= folded.length)
         continue;
       if (key[folded.length] === " ")
         continue;
-      for (const n of found)
+      for (const n of i.byPrint.get(key))
         if (n.kind !== "body" && n.listedCutsOnly !== true)
           out.push({ node: n, length: key.length });
     }
@@ -7415,6 +7440,24 @@ function createPlaceReader2(options = {}) {
     }
     return;
   }
+  function taggedHead(core, declared) {
+    const m = /^(.*\S)\s*(?:\(([^()[\]{}]*)\)|\[([^()[\]{}]*)\])$/su.exec(core);
+    if (m === null)
+      return;
+    const head = m[1];
+    const tag = (m[2] ?? m[3] ?? "").trim();
+    if (fold(head) === "" || fold(tag) === "")
+      return;
+    const h = read(head, declared);
+    const t = read(tag, declared);
+    if (h.refusal !== null || t.refusal !== null || h.heads.length === 0 || t.heads.length === 0)
+      return;
+    const held = (n) => t.heads.some((x) => isAncestor(x, n));
+    if (h.members !== undefined)
+      return h.members.every(held) ? h : undefined;
+    const kept = h.heads.filter(held);
+    return kept.length === 0 ? undefined : { ...h, heads: kept };
+  }
   function pieced(left, country) {
     if (namedInside(left, country).length > 0)
       return [left];
@@ -7569,7 +7612,7 @@ function createPlaceReader2(options = {}) {
     }
     const first = sane[0];
     if (first === undefined)
-      return (smushed ? desmush(core, declared) : undefined) ?? NOTHING;
+      return taggedHead(core, declared) ?? (smushed ? desmush(core, declared) : undefined) ?? NOTHING;
     if (sane.length === 1)
       return first;
     const heads = [];

package/dist/place.js

@@ -17,7 +17,8 @@ import {
   placesRelation2,
   probablySamePlace2,
   sameReading2
-} from "./chunks/place-jksxqsqb.js";
+} from "./chunks/place-sa6438qr.js";
+import"./chunks/place-tcgfvemw.js";
 export {
   DEFAULT_PLACE_CAPACITY2 as DEFAULT_PLACE_CAPACITY,
   DEFAULT_PLACE_READER2 as DEFAULT_PLACE_READER,

package/dist/promotion.js

@@ -46,7 +46,7 @@ function samePromotedRow(was, now) {
 }
 var STOOD_FOR = /^(?:'|(?![A-Za-z])\p{L})$/u;
 function questionMarksRead(was, now) {
-  const a = [...collapse(mojibakeRead(was))];
+  const a = [...collapse(cp437Read(mojibakeRead(was), now))];
   if (!a.includes("?"))
     return a.join("");
   const b = [...collapse(now)];
@@ -67,6 +67,47 @@ function questionMarksRead(was, now) {
   }
   return out.join("");
 }
+var CP437_LETTERS = new Map([
+  [128, "Ç"],
+  [129, "ü"],
+  [130, "é"],
+  [131, "â"],
+  [132, "ä"],
+  [133, "à"],
+  [134, "å"],
+  [135, "ç"],
+  [136, "ê"],
+  [137, "ë"],
+  [138, "è"],
+  [139, "ï"],
+  [140, "î"],
+  [141, "ì"],
+  [142, "Ä"],
+  [143, "Å"],
+  [144, "É"],
+  [145, "æ"],
+  [147, "ô"],
+  [148, "ö"],
+  [149, "ò"],
+  [150, "û"],
+  [151, "ù"],
+  [152, "ÿ"],
+  [153, "Ö"],
+  [154, "Ü"],
+  [160, "á"],
+  [161, "í"],
+  [162, "ó"],
+  [163, "ú"],
+  [164, "ñ"],
+  [165, "Ñ"]
+].map(([byte, letter]) => [String.fromCodePoint(byte), letter]));
+function cp437Read(was, now) {
+  const a = [...was];
+  const b = [...now];
+  if (a.length !== b.length)
+    return was;
+  return a.map((x, i) => CP437_LETTERS.get(x) === b[i] ? b[i] : x).join("");
+}
 function mojibakeRead(print) {
   let out = print;
   const codes = [...out].map((c) => c.codePointAt(0) ?? 0);

package/dist/school.js

@@ -1,3 +1,7 @@
+import {
+  SHARED_ROW_SENTINELS2,
+  sentinelIn2
+} from "./chunks/place-tcgfvemw.js";
 import {
   NEVER_NAME,
   printZones,
@@ -8,11 +12,7 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-jksxqsqb.js";
-import {
-  SHARED_ROW_SENTINELS2,
-  sentinelIn2
-} from "./chunks/place-tcgfvemw.js";
+} from "./chunks/place-sa6438qr.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";
@@ -21,8 +21,6 @@ import { normalizeApostrophes as normalizeApostrophes2 } from "@finbheara/names/
 import { SURNAME_SEPARATOR, lexiconKey, titleCaseNamePart } from "@finbheara/names/normalize";
 import { personName } from "@finbheara/names/normalize";
 
-import { placeholderOf } from "@finbheara/names/normalize";
-
 var SCHOOL_CELL_OWN_SENTINELS = [
   {
     print: "no school",
@@ -74,7 +72,31 @@ var SCHOOL_CELL_OWN_SENTINELS = [
     print: "unknown irish dancing school",
     authority: "`Unknown Irish Dancing School`: 1 school cell"
   },
-  { print: "none inactive dancer", authority: "`None - Inactive Dancer`: 1 school cell" }
+  { print: "none inactive dancer", authority: "`None - Inactive Dancer`: 1 school cell" },
+  { print: "not applicable", authority: "`Not applicable`: a school print, no school entered" },
+  {
+    print: "no school judge",
+    authority: "`No School - Judge`: an entry form's option for an adjudicator"
+  },
+  { print: "no dance school", authority: "`No Dance School`: an entry form's option" },
+  { print: "unknown music school", authority: "`Unknown Music School`: an entry form's option" },
+  { print: "school deleted", authority: "`---SCHOOL DELETED`: an entry form's option" },
+  { print: "select school", authority: "`--Select School--`: an entry form's unchosen option" },
+  { print: "school other", authority: "`School Other`: an entry form's option" },
+  { print: "non", authority: "`Non`: an entry form's option, the truncation of `Non-dancer`" },
+  {
+    print: "x closed select new school",
+    authority: "`X - CLOSED - Select New School`: an entry form's option for a closed school"
+  },
+  {
+    print: "x school closed please select another school",
+    authority: "`X -SCHOOL CLOSED - Please select another school`: an entry form's option"
+  },
+  { print: "default school", authority: "`Default School`: an entry form's default" },
+  {
+    print: "my school of irish dance",
+    authority: "`My School of Irish Dance`: an entry form's example text"
+  }
 ];
 var SCHOOL_CELL_SENTINELS = [
   ...SHARED_ROW_SENTINELS2,
@@ -321,7 +343,7 @@ function notASchoolIn(rows) {
     const text = normalizeForRefusal(print);
     if (text === "")
       return;
-    const placeholder = schoolCellSentinelOf(text) ?? placeholderOf(text);
+    const placeholder = schoolCellSentinelOf(text);
     if (placeholder !== undefined)
       return placeholderRow(placeholder);
     for (const row of rows) {

package/package.json

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