@mailwoman/corpus 10.0.0 → 10.2.0

package/out/adapters/street-line.js

@@ -0,0 +1,118 @@
+/**
+ * @copyright Sister Software
+ * @license AGPL-3.0
+ * @author Teffen Ellis, et al.
+ *
+ *   This module reads a house number and a street out of the columns a publisher supplies.
+ *
+ * Publishers divide the same address two ways. Some write one street line that holds the number and
+ * the street together. {@linkcode splitStreetLine} separates that line for a number-first country and
+ * {@linkcode splitTrailingStreetLine} for a number-last one. Others write the number across
+ * two columns. {@linkcode composeHouseNumber} joins those. Every adapter facing either shape uses
+ * these, so an edge case fixed here is fixed for all of them.
+ *
+ * Which of the two split functions a country takes is `STREET_ORDERS` in
+ * `packages/mailwoman/tools/dev-tools/codex/street-orders.ts`, whose values reach the generated
+ * layouts `@mailwoman/codex/address/layouts` serves.
+ */
+/**
+ * A leading house number on a US-style street line contains digits and an optional hyphenated range
+ * (Queens `40-12`), an optional single alpha suffix (`101A`), then whitespace, then the rest.
+ *
+ * The remainder must stay `(\S.*)` and must not become `(.+)`: `\s+` and `.` both match a tab,
+ * so `\s+(.+)$` lets the engine split a run of tabs between the two groups every possible way
+ * before failing — quadratic backtracking on attacker-shaped input.
+ * The required non-space start removes the overlap.
+ *
+ * Group 2 is trimmed by the caller either way, so the two forms are indistinguishable on real input.
+ * Only the failure cost differs.
+ */
+export const HOUSE_NUMBER_PREFIX = /^(\d+(?:-\d+)?[A-Za-z]?)\s+(\S.*)$/;
+/**
+ * Split a US-style street line on {@link HOUSE_NUMBER_PREFIX}.
+ *
+ * The US CSV sources follow USPS Publication 28 conventions with hand-entry drift.
+ * The leading digit run is the house number (`"123 Main St"`, `"6450 W Indian School Rd"`),
+ * and the regex tolerates one trailing letter (`"123A Main St"`) plus an optional
+ * hyphenated half (`"40-12 Bell Blvd"`, common in NYC and suburban garden-apartment
+ * numbering. Hawaii uses it island-wide — `"47-470 Hui Aeko Place"`).
+ *
+ * @returns `null` for blank input.
+ * An input that does not match the prefix shape, including `"PO Box 1234"`,
+ * `"RR 2 Box 67"` and `"HC 1"`, becomes a single `street` value rather than being mangled,
+ * so the model sees the original surface form and downstream classifiers pick it up.
+ * A caller that needs those forms recognized as something other than a street
+ * (see `usgov-irs-bmf`) tests for them before calling this.
+ */
+export function splitStreetLine(line) {
+    const trimmed = line.trim();
+    if (!trimmed)
+        return null;
+    const match = HOUSE_NUMBER_PREFIX.exec(trimmed);
+    if (match)
+        return { house_number: match[1], street: match[2].trim() };
+    return { street: trimmed };
+}
+/**
+ * A trailing house number on a number-last street line contains digits,
+ * an optional single alpha suffix written against them (`39A`), and an optional slash-
+ * or hyphen-joined subdivision (`2/TER`, `16/18`, `12-B`).
+ *
+ * The street and the number are separated by whitespace, a comma, or both,
+ * because a publisher in a number-last country may write either: Italy's ANAC release
+ * holds `VIA INDIPENDENZA, 41` and `VIA MAZZINI 7` in the same column.
+ * The separator is required, so `VIA1` stays one street name.
+ *
+ * Group 1 starts at `\S` and the lazy `.*?` is bounded by that required separator,
+ * so a run of whitespace between the two groups has one split rather than every possible split.
+ * That is the same backtracking argument {@linkcode HOUSE_NUMBER_PREFIX} records, read from the other end.
+ */
+export const HOUSE_NUMBER_SUFFIX = /^(\S.*?)[\s,]+(\d+[A-Za-z]?(?:\s*[/-]\s*[0-9A-Za-z]{1,4})?)$/u;
+/**
+ * Split a number-last street line on {@link HOUSE_NUMBER_SUFFIX}.
+ *
+ * A number-last country writes the number after the street name.
+ * `STREET_ORDERS` records that order for Italy, Germany, Finland and 150 other jurisdictions.
+ *
+ * Whitespace inside the line is collapsed, and the separators inside a subdivided
+ * number are closed up, so `VIA PERUGIA 2 / A` yields `2/A`.
+ *
+ * @returns `null` for blank input.
+ * A line that ends in anything but a number becomes a single `street` value
+ * rather than being mangled, as `PIAZZA CASTELLO` and `VIALE ROMA SNC` do.
+ * A caller that treats an unplaced number inside such a line as a defect tests
+ * the returned `street` for a digit.
+ * This function leaves that decision to the caller, because a street name can legitimately hold a digit.
+ */
+export function splitTrailingStreetLine(line) {
+    const trimmed = line.replaceAll(/\s+/gu, " ").trim();
+    if (!trimmed)
+        return null;
+    const match = HOUSE_NUMBER_SUFFIX.exec(trimmed);
+    if (!match)
+        return { street: trimmed };
+    return { house_number: match[2].replaceAll(/\s*([/-])\s*/gu, "$1"), street: match[1].trim() };
+}
+/**
+ * Joins a house number to the suffix a publisher stores in its own column.
+ *
+ * Several registers split a house number across two columns: BAN writes `10`
+ * and `bis`, Kartverket writes `12` and `B`.
+ * The separator differs per publisher, so the caller states it, and the two values are
+ * trimmed here because a publisher's padding is not part of the number.
+ *
+ * @param number The numeric part, from the publisher's number column.
+ * @param suffix The letter or word that follows it, from the publisher's suffix column.
+ * @param separator What to place between them.
+ * Kartverket joins `12` and `B` as `12B`; BAN joins `10` and `bis` as `10 bis`.
+ * @returns The joined number, or an empty string when the numeric part is absent.
+ * A caller treats the empty string as a row with no house number rather than assigning it.
+ */
+export function composeHouseNumber(number, suffix, separator = "") {
+    const trimmedNumber = number.trim();
+    if (!trimmedNumber)
+        return "";
+    const trimmedSuffix = suffix.trim();
+    return trimmedSuffix ? `${trimmedNumber}${separator}${trimmedSuffix}` : trimmedNumber;
+}
+//# sourceMappingURL=street-line.js.map

package/out/adapters/street-line.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"street-line.js","sourceRoot":"","sources":["../../lib/adapters/street-line.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,oCAAoC,CAAA;AAUvE;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAE3B,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAA;IAEzB,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAE/C,IAAI,KAAK;QAAE,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,EAAE,CAAA;IAEtE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;AAC3B,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,+DAA+D,CAAA;AAElG;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAY;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;IAEpD,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAA;IAEzB,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAE/C,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;IAEtC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,EAAE,CAAA;AAChG,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,MAAc,EAAE,SAAS,GAAG,EAAE;IAChF,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAEnC,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAA;IAE7B,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAEnC,OAAO,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,GAAG,SAAS,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAA;AACtF,CAAC"}

package/out/adapters/wof/admin/json/adapter.d.ts

@@ -9,7 +9,7 @@
  *   `packages/corpus/lib/adapters/wof-admin/`, removed in this same change) was replaced by this
  *   one because the SQLite distribution path was unworkable for the real corpus build:
  *
- *   1. `dist.whosonfirst.org/sqlite/` is dead (NXDOMAIN); the Geocode-Earth mirror is the only one.
+ *   1. `dist.whosonfirst.org/sqlite/` is dead (nxdomain); the Geocode-Earth mirror is the only one.
  *   2. The Geocode-Earth-hosted postalcode DB tags every row `mz:is_current = -1` ("unknown but treated
  *        as active"); the SQLite adapter's `is_current = 1` predicate emitted zero rows.
  *   3. The `names` table in the SQLite distribution is empty — localized `name:*` variants live in a
@@ -20,7 +20,7 @@
  *   Input: a directory containing one or more cloned `whosonfirst-data-admin-<cc>` GitHub repos. Each
  *   repo has `data/XXX/YYY/ZZZ/<wof-id>.geojson` files; `**\/*.geojson` walks the tree recursively.
  *   Alternate-geometry siblings (`-alt-*`) are skipped — they're separate exports of the same
- *   record, not new records.
+ *   record rather than new records.
  *
  *   Per record, the adapter emits one row per `(name-variant, hierarchy-variant)` pair:
  *
@@ -39,37 +39,46 @@
  *   License: CC0. The adapter stamps every row with `CC0-1.0`.
  */
 import { type WOFVariantSpec } from "#adapters/wof/json-rows";
-import type { CorpusAdapter } from "#types";
-import { type WOFRecord } from "#utils";
+import { type CorpusAdapter } from "#types";
+import { type AncestorNames, type WOFRecord } from "#utils";
 /**
  * Compute the hierarchy variants for a record given its ancestry chain and the chosen `selfName`.
  *
- * `selfName` is the surface form to use for the record's own component (locality / region / country / subregion).
- * Callers pass the canonical `wof:name` for the `"default"` slot and a `name:*` localized value for variant slots;
- * ancestor names always come from the ancestor's canonical `wof:name`.
+ * `selfName` is the surface form to use for the record's own component
+ * (locality / region / country / subregion).
+ * Callers pass the canonical `wof:name` for the `"default"` slot and a `name:*`
+ * localized value for variant slots.
  *
- * Country variants substitute `COUNTRY_DISPLAY_NAME` for the default slot so the OpenCage template produces the
- * canonicalized form (`"United States of America"`), matching the legacy SQLite adapter's behavior.
+ * Ancestor names always come from the ancestor's canonical `wof:name`.
+ *
+ * Country variants substitute `COUNTRY_DISPLAY_NAME` for the default slot so the
+ * OpenCage template produces the canonicalized form (`"United States of America"`),
+ * matching the legacy SQLite adapter's behavior.
  */
-export declare function variantsFor(row: WOFRecord, ancestry: WOFRecord[], selfName: string): WOFVariantSpec[];
+export declare function variantsFor(row: WOFRecord, ancestry: AncestorNames, selfName: string): WOFVariantSpec[];
 /**
- * Build the per-record name-slot list. The canonical `"default"` slot uses the OpenCage-canonical country form when the
- * record is itself a country (matches SQLite-adapter behavior); every other placetype's default slot uses `wof:name`
- * verbatim.
+ * Build the per-record name-slot list.
+ *
+ * The canonical `"default"` slot uses the OpenCage-canonical country form
+ * when the record is itself a country (matches SQLite-adapter behavior);
+ * every other placetype's default slot uses `wof:name` verbatim.
  */
 export declare function nameSlotsFor(rec: WOFRecord): Array<{
     key: string;
     value: string;
 }>;
 /**
- * Registry id for this adapter. Stamped into every row it emits, so a corpus record can be traced back to the dataset
- * it came from.
+ * Registry id for this adapter.
+ *
+ * Stamped into every row it emits, so a corpus record can be traced back to the dataset it came from.
  */
 export declare const WOF_ADMIN_ADAPTER_ID = "wof-admin";
 /**
- * Construct the wof-admin JSON-bundle adapter. The adapter is stateless across runs; calling this twice with the same
- * input directory produces byte-identical `canonical.jsonl` (records are emitted in sorted `wof:id` order to be
- * insensitive to filesystem walk ordering).
+ * Construct the wof-admin JSON-bundle adapter.
+ *
+ * The adapter is stateless across runs.
+ * Two calls with the same input directory produce byte-identical `canonical.jsonl`
+ * (records are emitted in sorted `wof:id` order to be insensitive to filesystem walk ordering).
  */
 export declare function createWOFAdminAdapter(): CorpusAdapter;
 /**

package/out/adapters/wof/admin/json/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../../lib/adapters/wof/admin/json/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAKH,OAAO,EAKN,KAAK,cAAc,EACnB,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAgC,aAAa,EAAE,MAAM,QAAQ,CAAA;AACzE,OAAO,EAAoC,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAA;AAgCzE;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,EAAE,CA0ErG;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,SAAS,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAOlF;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,cAAc,CAAA;AAE/C;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,aAAa,CAsCrD;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,eAA0B,CAAA"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../../lib/adapters/wof/admin/json/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAKH,OAAO,EAKN,KAAK,cAAc,EACnB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAuD,KAAK,aAAa,EAAiB,MAAM,QAAQ,CAAA;AAC/G,OAAO,EAAwC,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAA;AAgCjG;;;;;;;;;;;;;GAaG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,EAAE,CA2EvG;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,SAAS,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAOlF;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,cAAc,CAAA;AAE/C;;;;;;GAMG;AACH,wBAAgB,qBAAqB,IAAI,aAAa,CA0CrD;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,eAA0B,CAAA"}

package/out/adapters/wof/admin/json/adapter.js

@@ -9,7 +9,7 @@
  *   `packages/corpus/lib/adapters/wof-admin/`, removed in this same change) was replaced by this
  *   one because the SQLite distribution path was unworkable for the real corpus build:
  *
- *   1. `dist.whosonfirst.org/sqlite/` is dead (NXDOMAIN); the Geocode-Earth mirror is the only one.
+ *   1. `dist.whosonfirst.org/sqlite/` is dead (nxdomain); the Geocode-Earth mirror is the only one.
  *   2. The Geocode-Earth-hosted postalcode DB tags every row `mz:is_current = -1` ("unknown but treated
  *        as active"); the SQLite adapter's `is_current = 1` predicate emitted zero rows.
  *   3. The `names` table in the SQLite distribution is empty — localized `name:*` variants live in a
@@ -20,7 +20,7 @@
  *   Input: a directory containing one or more cloned `whosonfirst-data-admin-<cc>` GitHub repos. Each
  *   repo has `data/XXX/YYY/ZZZ/<wof-id>.geojson` files; `**\/*.geojson` walks the tree recursively.
  *   Alternate-geometry siblings (`-alt-*`) are skipped — they're separate exports of the same
- *   record, not new records.
+ *   record rather than new records.
  *
  *   Per record, the adapter emits one row per `(name-variant, hierarchy-variant)` pair:
  *
@@ -39,12 +39,14 @@
  *   License: CC0. The adapter stamps every row with `CC0-1.0`.
  */
 import { COUNTRY_DISPLAY_NAME, emitWOFJSONRows, LOCALE_BY_COUNTRY, nameSlotsFor as wofNameSlotsFor, } from "#adapters/wof/json-rows";
-import { buildAncestryIndex, walkFeatures } from "#utils";
+import { SourceRegister } from "#registers";
+import { AddressRole, SurfaceOrigin } from "#types";
+import { buildAncestorNameIndex, walkFeatures } from "#utils";
 /**
  * Map a WOF placetype to a Mailwoman `ComponentTag`, or `undefined` to skip.
  *
- * Per-adapter deliberately (the postalcode adapter carries its own): each table is a record FILTER for its adapter's
- * emission set, not a shared vocabulary.
+ * Per-adapter deliberately (the postalcode adapter has its own): each table is a record
+ * filter for its adapter's emission set rather than a shared vocabulary.
  */
 function placetypeToTag(placetype) {
     switch (placetype) {
@@ -66,29 +68,34 @@ function placetypeToTag(placetype) {
         case "microhood":
             return "dependent_locality";
         default:
-            return undefined;
+            return null;
     }
 }
 /**
  * Compute the hierarchy variants for a record given its ancestry chain and the chosen `selfName`.
  *
- * `selfName` is the surface form to use for the record's own component (locality / region / country / subregion).
- * Callers pass the canonical `wof:name` for the `"default"` slot and a `name:*` localized value for variant slots;
- * ancestor names always come from the ancestor's canonical `wof:name`.
+ * `selfName` is the surface form to use for the record's own component
+ * (locality / region / country / subregion).
+ * Callers pass the canonical `wof:name` for the `"default"` slot and a `name:*`
+ * localized value for variant slots.
  *
- * Country variants substitute `COUNTRY_DISPLAY_NAME` for the default slot so the OpenCage template produces the
- * canonicalized form (`"United States of America"`), matching the legacy SQLite adapter's behavior.
+ * Ancestor names always come from the ancestor's canonical `wof:name`.
+ *
+ * Country variants substitute `COUNTRY_DISPLAY_NAME` for the default slot so the
+ * OpenCage template produces the canonicalized form (`"United States of America"`),
+ * matching the legacy SQLite adapter's behavior.
  */
 export function variantsFor(row, ancestry, selfName) {
     const selfTag = placetypeToTag(row.placetype);
     if (!selfTag)
         return [];
-    // Every variant here is a gazetteer hierarchy — `Paris`, `Paris, Île-de-France`, `Paris, Île-de-France, France` —
-    // and several steps are not addresses at all. See `WOFVariantSpec.hierarchy`.
+    // Every variant here is a gazetteer hierarchy — `Paris`, `Paris, Île-de-France`,
+    // `Paris, Île-de-France, France` — and several steps are not addresses at all.
+    // See `WOFVariantSpec.hierarchy`.
     const hierarchy = true;
-    const region = ancestry.find((a) => placetypeToTag(a.placetype) === "region");
-    const country = ancestry.find((a) => placetypeToTag(a.placetype) === "country");
-    const countryDisplay = COUNTRY_DISPLAY_NAME[row.country] ?? country?.name ?? row.country;
+    const region = ancestry.region;
+    const country = ancestry.country;
+    const countryDisplay = COUNTRY_DISPLAY_NAME[row.country] ?? country ?? row.country;
     const variants = [];
     switch (selfTag) {
         case "locality":
@@ -98,14 +105,14 @@ export function variantsFor(row, ancestry, selfName) {
                 variants.push({
                     hierarchy,
                     suffix: "with-region",
-                    components: { [selfTag]: selfName, region: region.name },
+                    components: { [selfTag]: selfName, region },
                 });
             }
             if (region && country) {
                 variants.push({
                     hierarchy,
                     suffix: "with-region-country",
-                    components: { [selfTag]: selfName, region: region.name, country: countryDisplay },
+                    components: { [selfTag]: selfName, region, country: countryDisplay },
                 });
             }
             else if (!region && country) {
@@ -141,9 +148,11 @@ export function variantsFor(row, ancestry, selfName) {
     }
 }
 /**
- * Build the per-record name-slot list. The canonical `"default"` slot uses the OpenCage-canonical country form when the
- * record is itself a country (matches SQLite-adapter behavior); every other placetype's default slot uses `wof:name`
- * verbatim.
+ * Build the per-record name-slot list.
+ *
+ * The canonical `"default"` slot uses the OpenCage-canonical country form
+ * when the record is itself a country (matches SQLite-adapter behavior);
+ * every other placetype's default slot uses `wof:name` verbatim.
  */
 export function nameSlotsFor(rec) {
     return wofNameSlotsFor(rec, {
@@ -153,26 +162,33 @@ export function nameSlotsFor(rec) {
     });
 }
 /**
- * Registry id for this adapter. Stamped into every row it emits, so a corpus record can be traced back to the dataset
- * it came from.
+ * Registry id for this adapter.
+ *
+ * Stamped into every row it emits, so a corpus record can be traced back to the dataset it came from.
  */
 export const WOF_ADMIN_ADAPTER_ID = "wof-admin";
 /**
- * Construct the wof-admin JSON-bundle adapter. The adapter is stateless across runs; calling this twice with the same
- * input directory produces byte-identical `canonical.jsonl` (records are emitted in sorted `wof:id` order to be
- * insensitive to filesystem walk ordering).
+ * Construct the wof-admin JSON-bundle adapter.
+ *
+ * The adapter is stateless across runs.
+ * Two calls with the same input directory produce byte-identical `canonical.jsonl`
+ * (records are emitted in sorted `wof:id` order to be insensitive to filesystem walk ordering).
  */
 export function createWOFAdminAdapter() {
     return {
         id: WOF_ADMIN_ADAPTER_ID,
         defaultLicense: "CC0-1.0",
+        addressRole: AddressRole.Premise,
+        register: SourceRegister.WhosOnFirst,
+        surface: SurfaceOrigin.Rendered,
         description: "Who's On First admin GeoJSON bundles (countries, regions, counties, localities) — multi-name variants per record.",
         async *rows(opts) {
             // Pass 1: scan every GeoJSON file once, build the in-memory record index.
-            // We keep only records whose placetype maps to a ComponentTag — irrelevant placetypes
-            // (campus, county-region hybrids on which Mailwoman has no opinion) are dropped here so
-            // they don't inflate the ancestry index. Country-filtered runs prune to the matching
-            // country code too; the ancestors of a same-country record live in the same admin repo.
+            // We keep only records whose placetype maps to a ComponentTag — irrelevant
+            // placetypes (campus, county-region hybrids on which Mailwoman has no opinion)
+            // are dropped here so they don't inflate the ancestry index.
+            // Country-filtered runs prune to the matching country code too.
+            // The ancestors of a same-country record live in the same admin repo.
             const byID = new Map();
             for await (const rec of walkFeatures(opts.inputPath, { signal: opts.signal })) {
                 if (opts.signal?.aborted)
@@ -183,8 +199,8 @@ export function createWOFAdminAdapter() {
                     continue;
                 byID.set(rec.id, rec);
             }
-            const ancestry = buildAncestryIndex(byID);
-            // Pass 2: emit rows in sorted-id order for deterministic JSONL.
+            const ancestry = buildAncestorNameIndex(byID, placetypeToTag);
+            // Pass 2: emit rows in sorted-id order for deterministic jsonl.
             yield* emitWOFJSONRows({
                 records: byID,
                 ancestry,

package/out/adapters/wof/admin/json/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../../lib/adapters/wof/admin/json/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../../lib/adapters/wof/admin/json/adapter.ts"],"names":[],"mappings":"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"}

package/out/adapters/wof/json-rows.d.ts

@@ -6,47 +6,58 @@
  */
 import type { ComponentTag } from "@mailwoman/codex/component";
 import type { AdapterOptions, CanonicalRow } from "#types";
-import { type WOFRecord } from "#utils";
+import { type AncestorNames, type WOFRecord } from "#utils";
 /**
  * Display name for the country, keyed by ISO 3166-1 alpha-2.
  *
- * Must be the **OpenCage-canonical** surface form: the `address-formatter` library expands some country names en route
- * to its output (e.g. `"United States"` → `"United States of America"`). If `components.country` and the formatted
- * `raw` disagree, alignment will fail downstream. Keying off the canonical form keeps the two in lockstep.
+ * Must be the **OpenCage-canonical** surface form: the `address-formatter` library expands some
+ * country names en route to its output (e.g. `"United States"` → `"United States of America"`).
+ * If `components.country` and the formatted `raw` disagree, alignment will fail downstream.
  *
- * Phase 1 US + FR only; extend as new locales come online. Missing countries fall back to the country row's `wof:name`,
- * accepting the alignment risk for non-canonicalized names.
+ * The canonical form keeps the two in lockstep.
+ *
+ * Phase 1 US + FR only.
+ * Extend as new locales come online.
+ *
+ * A missing country uses the country row's `wof:name`; this preserves the
+ * alignment risk for non-canonicalized names.
  */
 export declare const COUNTRY_DISPLAY_NAME: Record<string, string>;
 /**
- * BCP-47 locale defaulting for the corpus row's `locale` field. Defaulted by country.
+ * BCP-47 locale defaulting for the corpus row's `locale` field.
+ *
+ * Defaulted by country.
  */
 export declare const LOCALE_BY_COUNTRY: Record<string, string>;
 export interface WOFVariantSpec {
     suffix: string;
     components: Partial<Record<ComponentTag, string>>;
     /**
-     * Render this variant as an ADMIN HIERARCHY rather than as a postal address.
+     * Render this variant as an admin hierarchy rather than as a postal address.
      *
-     * A hierarchy variant is a query — `Paris`, then `Paris, Île-de-France`, then `Paris, Île-de-France, France` — and
-     * several of its steps are not addresses at all. France's postal layout carries no region, so rendering `{ locality,
-     * region }` through it prints `Paris` and the whole variant collapses into the one below it.
+     * A hierarchy variant is a query — `Paris`, then `Paris, Île-de-France`, then
+     * `Paris, Île-de-France, France` — and several of its steps are not addresses at all.
+     * France's postal layout has no region, so rendering `{ locality, region }` through
+     * it prints `Paris` and the whole variant collapses into the one below it.
      *
-     * So the hierarchy is joined in its own order: smallest unit first, or largest first for the systems that write that
-     * way, with the country's own separator.
+     * So the hierarchy is joined in its own order: smallest unit first, or largest first
+     * for the systems that write that way, with the country's own separator.
      */
     hierarchy?: boolean;
 }
 export interface NameSlotOptions {
     /**
-     * Canonical surface for the record's own `"default"` slot. Default `rec.name` verbatim; the admin adapter substitutes
-     * the OpenCage-canonical {@link COUNTRY_DISPLAY_NAME} for country records.
+     * Canonical surface for the record's own `"default"` slot.
+     *
+     * The admin adapter substitutes the OpenCage-canonical {@link COUNTRY_DISPLAY_NAME} for country records.
+     *
+     * @defaultValue `rec.name` verbatim.
      */
     canonicalName?: (rec: WOFRecord) => string;
 }
 /**
- * Build the per-record name-slot list: the canonical `"default"` slot, then every `name:*` variant deduplicated against
- * it so a redundant `"default"`-equivalent row is not emitted under a localized key.
+ * Build the per-record name-slot list: the canonical `"default"` slot, then every `name:*` variant
+ * deduplicated against it so a redundant `"default"`-equivalent row is not emitted under a localized key.
  */
 export declare function nameSlotsFor(rec: WOFRecord, options?: NameSlotOptions): Array<{
     key: string;
@@ -54,7 +65,13 @@ export declare function nameSlotsFor(rec: WOFRecord, options?: NameSlotOptions):
 }>;
 interface EmitWOFJSONRowsOptions {
     records: ReadonlyMap<number, WOFRecord>;
-    ancestry: ReadonlyMap<number, WOFRecord[]>;
+    /**
+     * The ancestor names each record's variants read, rather than its ancestor records.
+     *
+     * A record absent from the map resolves to an empty set of ancestor names.
+     * Records with no resolvable ancestor produce the same value.
+     */
+    ancestry: ReadonlyMap<number, AncestorNames>;
     adapterOptions: AdapterOptions;
     adapterID: string;
     localeByCountry: Readonly<Record<string, string>>;
@@ -63,7 +80,7 @@ interface EmitWOFJSONRowsOptions {
         key: string;
         value: string;
     }>;
-    variantsFor: (record: WOFRecord, ancestry: WOFRecord[], selfName: string) => WOFVariantSpec[];
+    variantsFor: (record: WOFRecord, ancestry: AncestorNames, selfName: string) => WOFVariantSpec[];
 }
 /**
  * Emit aligned rows in WOF-id order, enforcing the adapter limit across all name and hierarchy variants.

package/out/adapters/wof/json-rows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-rows.d.ts","sourceRoot":"","sources":["../../../lib/adapters/wof/json-rows.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAC1D,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAA;AAyCzD;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGvD,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGpD,CAAA;AAED,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IACjD;;;;;;;;;OASG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,eAAe;IAC/B;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAA;CAC1C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,GAAE,eAAoB,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAajH;AAED,UAAU,sBAAsB;IAC/B,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACvC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;IAC1C,cAAc,EAAE,cAAc,CAAA;IAC9B,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACjD,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAA;IAC3C,YAAY,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1E,WAAW,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,cAAc,EAAE,CAAA;CAC7F;AAED;;GAEG;AACH,wBAAiB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,CAAC,YAAY,CAAC,CA+CzF"}
+{"version":3,"file":"json-rows.d.ts","sourceRoot":"","sources":["../../../lib/adapters/wof/json-rows.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAC1D,OAAO,EAAoB,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAA;AA+C7E;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGvD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGpD,CAAA;AAED,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IACjD;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,eAAe;IAC/B;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAA;CAC1C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,GAAE,eAAoB,GAAG,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAajH;AAED,UAAU,sBAAsB;IAC/B,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACvC;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC5C,cAAc,EAAE,cAAc,CAAA;IAC9B,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACjD,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,OAAO,CAAA;IAC3C,YAAY,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1E,WAAW,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,KAAK,cAAc,EAAE,CAAA;CAC/F;AAUD;;GAEG;AACH,wBAAiB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,CAAC,YAAY,CAAC,CA+CzF"}

package/out/adapters/wof/json-rows.js

@@ -4,11 +4,13 @@
  * @author Teffen Ellis, et al.
  * @file Deterministic canonical-row emission shared by WOF GeoJSON adapters.
  */
-import { formatAddressRow } from "@mailwoman/codex/address-format";
-import { isLargestFirstSystem, lineJoinForCountry } from "@mailwoman/codex/address-layouts";
+import { formatAddressRow } from "@mailwoman/codex/address/format";
+import { isLargestFirstSystem, lineJoinForCountry } from "@mailwoman/codex/address/layouts";
 import { normalizeNameKey } from "#utils";
 /**
- * The order an admin hierarchy is written in, smallest unit first. A country that writes largest-first reverses it.
+ * The order an admin hierarchy is written in, smallest unit first.
+ *
+ * A country that writes largest-first reverses it.
  */
 const HIERARCHY_ORDER = [
     "postcode",
@@ -19,9 +21,13 @@ const HIERARCHY_ORDER = [
     "country",
 ];
 /**
- * Render an admin-hierarchy variant: the components it carries, in hierarchy order, joined the way the country joins a
- * line. This is a gazetteer QUERY rather than a postal address, which is why it does not go through a layout — a
- * country whose postal layout drops the region would collapse `Paris, Île-de-France` back into `Paris`.
+ * Render an admin-hierarchy variant: the components it contains, in hierarchy order,
+ * joined the way the country joins a line.
+ *
+ * This adapter emits a gazetteer query.
+ * It follows the gazetteer path without a postal layout.
+ *
+ * A country whose postal layout drops the region would collapse `Paris, Île-de-France` back into `Paris`.
  */
 function renderHierarchy(components, country) {
     const order = isLargestFirstSystem(country) ? [...HIERARCHY_ORDER].toReversed() : HIERARCHY_ORDER;
@@ -41,27 +47,34 @@ function renderHierarchy(components, country) {
 /**
  * Display name for the country, keyed by ISO 3166-1 alpha-2.
  *
- * Must be the **OpenCage-canonical** surface form: the `address-formatter` library expands some country names en route
- * to its output (e.g. `"United States"` → `"United States of America"`). If `components.country` and the formatted
- * `raw` disagree, alignment will fail downstream. Keying off the canonical form keeps the two in lockstep.
+ * Must be the **OpenCage-canonical** surface form: the `address-formatter` library expands some
+ * country names en route to its output (e.g. `"United States"` → `"United States of America"`).
+ * If `components.country` and the formatted `raw` disagree, alignment will fail downstream.
+ *
+ * The canonical form keeps the two in lockstep.
+ *
+ * Phase 1 US + FR only.
+ * Extend as new locales come online.
  *
- * Phase 1 US + FR only; extend as new locales come online. Missing countries fall back to the country row's `wof:name`,
- * accepting the alignment risk for non-canonicalized names.
+ * A missing country uses the country row's `wof:name`; this preserves the
+ * alignment risk for non-canonicalized names.
  */
 export const COUNTRY_DISPLAY_NAME = {
     US: "United States of America",
     FR: "France",
 };
 /**
- * BCP-47 locale defaulting for the corpus row's `locale` field. Defaulted by country.
+ * BCP-47 locale defaulting for the corpus row's `locale` field.
+ *
+ * Defaulted by country.
  */
 export const LOCALE_BY_COUNTRY = {
     US: "en-US",
     FR: "fr-FR",
 };
 /**
- * Build the per-record name-slot list: the canonical `"default"` slot, then every `name:*` variant deduplicated against
- * it so a redundant `"default"`-equivalent row is not emitted under a localized key.
+ * Build the per-record name-slot list: the canonical `"default"` slot, then every `name:*` variant
+ * deduplicated against it so a redundant `"default"`-equivalent row is not emitted under a localized key.
  */
 export function nameSlotsFor(rec, options = {}) {
     const canonicalSelfName = options.canonicalName?.(rec) ?? rec.name;
@@ -75,6 +88,13 @@ export function nameSlotsFor(rec, options = {}) {
     }
     return slots;
 }
+/**
+ * The value a record uses in place of ancestor names when its ancestors do not resolve.
+ *
+ * Frozen and shared, because the emitter reaches it once per such record
+ * and constructing a fresh object per row would allocate one per name slot.
+ */
+const NO_ANCESTORS = Object.freeze({});
 /**
  * Emit aligned rows in WOF-id order, enforcing the adapter limit across all name and hierarchy variants.
  */
@@ -88,7 +108,7 @@ export function* emitWOFJSONRows(options) {
         if (!shouldEmit(record))
             continue;
         for (const slot of slotsForRecord(record)) {
-            for (const variant of variantsFor(record, ancestry.get(id) ?? [], slot.value)) {
+            for (const variant of variantsFor(record, ancestry.get(id) ?? NO_ANCESTORS, slot.value)) {
                 if (adapterOptions.limit !== undefined && emitted >= adapterOptions.limit)
                     return;
                 const rendered = variant.hierarchy

package/out/adapters/wof/json-rows.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-rows.js","sourceRoot":"","sources":["../../../lib/adapters/wof/json-rows.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json-rows.js","sourceRoot":"","sources":["../../../lib/adapters/wof/json-rows.ts"],"names":[],"mappings":"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"}