@finbheara/domain 0.40.0 → 0.42.0

package/dist/chunks/{place-k6y6fe1y.js → place-5kmn6jgj.js}

@@ -7422,6 +7422,7 @@ function genericKey2(folded) {
 var DEFAULT_PLACE_CAPACITY2 = 8192;
 var PLACE_CELL_SENTINELS = [...SHARED_ROW_SENTINELS2];
 var placeCellSentinelOf = sentinelIn2(PLACE_CELL_SENTINELS);
+var SHARED_INDEXES = new WeakMap;
 function createPlaceReader2(options = {}) {
   const nodes = options.tree ?? PLACE_NODES;
   const withinTable = options.within ?? PLACE_WITHIN;
@@ -7500,14 +7501,7 @@ function createPlaceReader2(options = {}) {
     const listedPhrases = new Set;
     const byHeading = new Map;
     const byRunPrint = new Map;
-    const byGeneric = new Map;
     for (const n of source) {
-      if (generic && n.kind === "city")
-        for (const p of [n.name, ...n.prints]) {
-          const k = genericKey2(fold(p));
-          if (k !== undefined)
-            push(byGeneric, k, n);
-        }
       for (const h of n.headings ?? [])
         push(byHeading, fold(h), n);
       for (const r of n.runPrints ?? [])
@@ -7515,11 +7509,12 @@ function createPlaceReader2(options = {}) {
       push(byPrint, fold(n.id), n);
       if (n.kind !== "body")
         push(byPrint, fold(n.name), n);
-      for (const p of n.prints)
-        push(byPrint, fold(p), n);
-      for (const p of n.prints)
-        if (fold(p).includes(" "))
-          listedPhrases.add(fold(p));
+      for (const p of n.prints) {
+        const f = fold(p);
+        push(byPrint, f, n);
+        if (f.includes(" "))
+          listedPhrases.add(f);
+      }
       for (const c of n.codes)
         push(byCode, c, n);
       for (const t of n.truncations ?? [])
@@ -7571,9 +7566,15 @@ function createPlaceReader2(options = {}) {
       }
       return out;
     };
-    const parents = new Map;
-    for (const n of source)
-      parents.set(n.id, upOf(n));
+    let parents;
+    const graph = () => {
+      if (parents !== undefined)
+        return parents;
+      parents = new Map;
+      for (const n of source)
+        parents.set(n.id, upOf(n));
+      return parents;
+    };
     const countryOnMap = (n) => {
       const seen = new Set;
       for (let at = n;at !== undefined && !seen.has(at.id); ) {
@@ -7597,8 +7598,15 @@ function createPlaceReader2(options = {}) {
       }
       return;
     };
-    const ancestorsOf = new Map;
-    for (const n of source) {
+    const ancestors = new Map;
+    const ancestorsOf = (id) => {
+      const held = ancestors.get(id);
+      if (held !== undefined)
+        return held;
+      const n = byId.get(id);
+      if (n === undefined)
+        return;
+      const parents = graph();
       const out = new Set;
       const todo = [n];
       const own = countryOnMap(n);
@@ -7616,35 +7624,67 @@ function createPlaceReader2(options = {}) {
           todo.push(parent);
         }
       }
-      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);
+      ancestors.set(id, out);
+      return out;
+    };
+    let byStem;
+    let byGeneric;
     return {
       byId,
       byPrint,
-      printsSorted,
+      get byStem() {
+        if (byStem !== undefined)
+          return byStem;
+        byStem = new Map;
+        for (const k of byPrint.keys()) {
+          if (k.length < MIN_STEM)
+            continue;
+          const stem = k.slice(0, MIN_STEM);
+          const run = byStem.get(stem);
+          if (run === undefined)
+            byStem.set(stem, [k]);
+          else
+            run.push(k);
+        }
+        return byStem;
+      },
       byCode,
       byTruncation,
       byCountryCode,
       bySubdivisionPart,
       byOireachtas,
       ancestorsOf,
-      carries,
-      phrases,
+      get carries() {
+        graph();
+        return carries;
+      },
       listedPhrases,
       byHeading,
       byRunPrint,
-      byGeneric
+      get byGeneric() {
+        if (byGeneric !== undefined)
+          return byGeneric;
+        byGeneric = new Map;
+        for (const n of source)
+          if (n.kind === "city")
+            for (const p of [n.name, ...n.prints]) {
+              const k = genericKey2(fold(p));
+              if (k !== undefined)
+                push(byGeneric, k, n);
+            }
+        return byGeneric;
+      }
     };
   }
   function idx() {
-    if (index === undefined)
-      index = buildIndex(nodes);
+    if (index !== undefined)
+      return index;
+    index = SHARED_INDEXES.get(nodes) ?? buildIndex(nodes);
+    SHARED_INDEXES.set(nodes, index);
     return index;
   }
   function ancestorIds(n) {
-    return idx().ancestorsOf.get(n.id) ?? new Set;
+    return idx().ancestorsOf(n.id) ?? new Set;
   }
   function isAncestor(a, b) {
     return a.id === b.id || ancestorIds(b).has(a.id);
@@ -7889,27 +7929,9 @@ function createPlaceReader2(options = {}) {
     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] of run) {
-      if (key.length <= folded.length)
+    for (const key of i.byStem.get(folded.slice(0, MIN_STEM)) ?? []) {
+      if (key.length <= folded.length || !key.startsWith(folded))
         continue;
       if (key[folded.length] === " ")
         continue;

package/dist/geocode.js

@@ -5,7 +5,7 @@ import {
   place2,
   placeFromId2,
   placeParts2
-} from "./chunks/place-k6y6fe1y.js";
+} from "./chunks/place-5kmn6jgj.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~~3489854|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",
@@ -149,7 +149,8 @@ var PLACE_TOWNS = {
   "USA-WY": "Afton~~9x95~5816861|Alpine~~9x9j~5817073~AU.07.20110|Antelope Valley-Crestview~~9xug~7260797|Arapahoe~~9xdu~5817340|Bar Nunn~~9xsk~5817809|Basin~~9xgh~5817923|Bear River~~9x35~5818158|Big Piney~~9x99~5818702|Buffalo~~9xuh~5819881|Byron~~9xfy~5820291~AU.02.11350|Casper~~9xs7~5820705|Cheyenne~~9xm6~5821086|Clearview Acres~~9x6k~5821415|Cody~~9xfm~5821593|Cokeville~~9x3p~5821618|Cowley~~9xfz~5822154~CA.01.4803016|Dayton~~9xgx~5822752|Diamondville~~9x3m~5823199|Douglas~~9xt5~5823516~AU.04.32810~3042237|Dubois~~9xdp~5823819|Ethete~~9xds~5824773|Evanston~~9x34~5824805|Evansville~~9xs7~5824810|Fort Washakie~~9xds~5825424|Fox Farm-College~~9xm3~7261302|Gillette~~9xug~5826027|Glenrock~~9xse~5826088|Green River~~9x6h~5826559|Greybull~~9xgj~5826603|Guernsey~~9xt8~5826723|Hanna~~9xkn~5826986~CA.01.4804011|Hartrandt~~9xs7~5827151|Hoback~~9x9n~5827703|Jackson~~9x9p~5828648|James Town~~9x6h~5828717|Kemmerer~~9x3m~5829425|La Barge~~9x98~5829816|Lander~~9xde~5830007|Laramie~~9xkg~5830062|Lovell~~9xfz~5831176|Lucerne~~9xg0~5831275|Lusk~~9xte~5831333|Lyman~~9x3e~5831346|Marbleton~~9x9d~5831530|Mills~~9xs7~5832481|Moorcroft~~9xv7~5832698|Moose Wilson Road~~9x9p~5832759|Mountain View~~9x3d~5832901|Newcastle~~9xvc~5833349~AU.02.15900|North Rock Springs~~9x6k~5833892|Pine Bluffs~~9xmf~5835069|Pine Haven~~9xvk~5835124|Pinedale~~9x9g~5835178|Powell~~9xfw~5835606|Purple Sage~~9x6k~5835760|Rafter J Ranch~~9x9p~5835865|Ranchester~~9xgz~5835955|Ranchettes~~9xm6~5835956|Rawlins~~9x7t~5836068|Reliance~~9x6m~5836399|Riverton~~9xdu~5836665|Rock Springs~~9x6k~5836898|Saratoga~~9xk5~5837593|Sheridan~~9xgy~5838198|Shoshoni~~9xej~5838312|Sleepy Hollow~~9xv5~5838617|South Greeley~~9xm3~5839233|South Park~~9x9p~5839264|Star Valley Ranch~~9x9h~8479282|Story~~9xgv~5840065|Sundance~~9xvu~5840284|Thermopolis~~9xg0~5840846|Torrington~~9xmz~5841207|Upton~~9xvd~5841818|Vista West~~9xs7~7176041|Washakie Ten~~9xg6~5842272|Wheatland~~9xmr~5842753|Wilson~~9x9p~5843239|Worland~~9xg4~5843495|Wright~~9xub~5843515"
 };
 
-var slug = (s) => s.normalize("NFD").replace(/\p{M}/gu, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+var ASCII = /^[ -~]*$/;
+var slug = (s) => (ASCII.test(s) ? s : s.normalize("NFD").replace(/\p{M}/gu, "")).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 var towns;
 function geocodeTowns() {
   if (towns !== undefined)
@@ -182,6 +183,8 @@ function townNodes() {
   const ascii = new Map;
   for (const parent of Object.keys(PLACE_TOWNS))
     for (const row of PLACE_TOWNS[parent].split("|")) {
+      if (row[row.indexOf("~") + 1] === "~")
+        continue;
       const [, a, , id] = row.split("~");
       if (a !== "")
         ascii.set(id, a);
@@ -200,14 +203,19 @@ function townNodes() {
   }
   return out;
 }
+var layerTree;
 var layer;
 var genericLayer;
+function layerNodes() {
+  layerTree ??= [...PLACE_NODES, ...townNodes()];
+  return layerTree;
+}
 function layerReader() {
-  layer ??= createPlaceReader2({ tree: [...PLACE_NODES, ...townNodes()] });
+  layer ??= createPlaceReader2({ tree: layerNodes() });
   return layer;
 }
 function genericReader() {
-  genericLayer ??= createPlaceReader2({ tree: [...PLACE_NODES, ...townNodes()], generic: true });
+  genericLayer ??= createPlaceReader2({ tree: layerNodes(), generic: true });
   return genericLayer;
 }
 function oneTown(t) {

package/dist/place.js

@@ -19,7 +19,7 @@ import {
   placesRelation2,
   probablySamePlace2,
   sameReading2
-} from "./chunks/place-k6y6fe1y.js";
+} from "./chunks/place-5kmn6jgj.js";
 import"./chunks/place-tcgfvemw.js";
 export {
   DEFAULT_PLACE_CAPACITY2 as DEFAULT_PLACE_CAPACITY,

package/dist/school.js

@@ -12,7 +12,7 @@ import {
   areAllPlaceTokens2,
   placeRelation2,
   sameReading2
-} from "./chunks/place-k6y6fe1y.js";
+} from "./chunks/place-5kmn6jgj.js";
 import {
   validity
 } from "./chunks/place-q9kwsmzd.js";

package/package.json

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