@mailwoman/codex 9.2.0 → 9.4.0

package/README.md

@@ -23,7 +23,7 @@ fr.postcodePattern // → /^\d{5}$/
 
 // US ZIP code branded type
 import { us } from "@mailwoman/codex"
-const zip: us.ZipCode = "94043" // branded, not just string
+const zip: us.ZipCode = "94043" // branded, not string alone
 ```
 
 ## Supported address systems
@@ -66,7 +66,7 @@ clothes.
 
 One `postalcode` placetype covers systems that are not comparable. An Irish Eircode
 names a single address; an Australian postcode names a locality. Between them sit
-most of the world, and the distinction that actually changes an answer is narrower:
+most of the world, and the distinction that changes an answer is narrower:
 **is this code finer than the locality that contains it?**
 
 That is a fact about a country's _administrative_ geography, not its postal system,
@@ -106,7 +106,7 @@ nothing noticed.
   no network. Suitable for bundling into browser and edge environments.
 - **Branded types.** ZIP codes, postcodes, and abbreviations carry nominal types
   so the type system catches locale mismatches at compile time.
-- **Single source of truth.** The resolver, the decoder's convention masks, the
+- **One definition.** The resolver, the decoder's convention masks, the
   corpus synthesis layer, and the matcher all import from `@mailwoman/codex`.
 
 ## The normative tier (codex vs the libpostal dictionaries)
@@ -120,7 +120,7 @@ be merged:
   invariance transforms, and formatting (rendering `N` vs `North` requires knowing
   which form the authority prints).
 - **The libpostal dictionaries** (`core/data/libpostal/dictionaries/`, Pelias
-  lineage) **are descriptive**: everything people actually write, including forms no
+  lineage) **are descriptive**: everything people write, including forms no
   authority recognizes (`en/directionals.txt` lists `lower`/`upper`/`central`).
   Their consumers are recall-shaped — evidence-lexicon curation laws, street
   decomposition for training gold, the street-morphology FST. See the README in

package/{address-system-conventions.ts → lib/address-system-conventions.ts}

@@ -18,9 +18,9 @@
  *   by the caller) — an undetected system parses exactly as before.
  */
 
-import { CODE_POSTAL_PATTERN } from "./fr/code-postal.ts"
-import { UK_POSTCODE_PATTERN } from "./gb/postcode.ts"
-import type { SystemCode } from "./postcode-systems.ts"
+import { CODE_POSTAL_PATTERN } from "#fr/code-postal"
+import { UK_POSTCODE_PATTERN } from "#gb/postcode"
+import type { SystemCode } from "#postcode-systems"
 
 export interface AddressSystemConventions {
 	/**
@@ -48,11 +48,11 @@ export const ADDRESS_SYSTEM_CONVENTIONS: Partial<Record<SystemCode, AddressSyste
 	 * street-suffix class; Pub-28's suffix decomposition has no French counterpart).
 	 *
 	 * Provenance / why this is NOT a blanket prefix+suffix forbid (#719, 2026-06-18): an earlier model mis-tagged the
-	 * leading "Rue" as a US-style `street_suffix` (RUE is a Pub-28 suffix variant) — the 2026-06-10 v1.1.0 gate — so #511
-	 * forbade BOTH affix tags to stop that leakage. That forbid was correct for THAT model but became a live production
-	 * bug for the current one: the shipped model (v1.5.0) emits the FR `street_prefix` correctly, but the conventions
-	 * mask was a hard −1e9 on every B-/I-street_prefix emission, so the detected-FR parse could never KEEP a prefix — it
-	 * destroyed `street_prefix` wholesale (measured on data/eval/external/ fr-street-prefix-real.jsonl at
+	 * leading "Rue" as a US-style `street_suffix` (RUE is a Pub-28 suffix variant) — the 2026-06-10 v1.1.0 promotion eval
+	 * — so #511 forbade BOTH affix tags to stop that leakage. That forbid was correct for THAT model but became a live
+	 * production bug for the current one: the shipped model (v1.5.0) emits the FR `street_prefix` correctly, but the
+	 * conventions mask was a hard −1e9 on every B-/I-street_prefix emission, so the detected-FR parse could never KEEP a
+	 * prefix — it destroyed `street_prefix` wholesale (measured on data/eval/external/ fr-street-prefix-real.jsonl at
 	 * conventions=auto: F1 0.0 with the forbid on → 80.0 with it off; the larger real-FR eval reported the same collapse,
 	 * ~96 → ~0.6). We keep ONLY `street_suffix` forbidden: the current model with the forbid OFF shows zero FR
 	 * street_suffix leakage (fp=0 on that same slice) and FR has no trailing street suffix, so the constraint costs
@@ -72,7 +72,7 @@ export const ADDRESS_SYSTEM_CONVENTIONS: Partial<Record<SystemCode, AddressSyste
 	 * the raw text — exactly the shape-INVALID class `postcodePattern` exists to flag.
 	 *
 	 * Provenance (#1275, 2026-07-24): on the GB golden board's 106 postcode rows under the en-gb bundle, the clip class
-	 * (parsed postcode = proper suffix of the truth) was 44/106 with this row absent — the repair gate never opened
+	 * (parsed postcode = proper suffix of the truth) was 44/106 with this row absent — the repair check never opened
 	 * because `conventionsForSystem("gb")` returned null. With the repair reachable, exact 26 → 83 and the clip class
 	 * goes to zero. No `forbiddenTags`: no measured GB-ungrammatical tag class exists (the FR street_suffix forbid's
 	 * lesson — a forbid needs measured zero-cost receipts, and GB street grammar shares the trailing-suffix family with

package/{au → lib/au}/index.ts

@@ -9,7 +9,7 @@
  *   territories, and the 4-digit postcode.
  */
 
-export * from "./delivery-service.ts"
-export * from "./level-designator.ts"
-export * from "./postcode.ts"
-export * from "./state.ts"
+export * from "#au/delivery-service"
+export * from "#au/level-designator"
+export * from "#au/postcode"
+export * from "#au/state"

package/{ca → lib/ca}/index.ts

@@ -7,6 +7,6 @@
  *   postcodes, and the provinces and territories.
  */
 
-export * from "./postal-code.ts"
-export * from "./province.ts"
-export * from "./street-type.ts"
+export * from "#ca/postal-code"
+export * from "#ca/province"
+export * from "#ca/street-type"

package/{ca → lib/ca}/postal-code.ts

@@ -27,7 +27,7 @@
 
 import type { Tagged } from "type-fest"
 
-import type { CanadianProvinceCode } from "./province.ts"
+import type { CanadianProvinceCode } from "#ca/province"
 
 /**
  * Characters in a Canadian postcode once spaces are stripped: `A1A1A1`.

package/{ca → lib/ca}/province.ts

@@ -16,7 +16,7 @@
  *   regions, the Canadian code IS a surface form, not just a resolver key.
  */
 
-import { foldName } from "../normalize.ts"
+import { foldName } from "#normalize"
 
 /**
  * Per-province record: ISO 3166-2:CA code, English name, and the co-official French name.

package/{ca → lib/ca}/street-type.ts

@@ -23,6 +23,8 @@
  *   Ouest = West is recognized.
  */
 
+import { foldToken } from "#normalize"
+
 /**
  * English Canadian street-type words (Canada Post's recognized set, lowercase). Appear as the TRAILING token of an
  * English street name (`Maple Avenue`, `Sunset Crescent`).
@@ -53,7 +55,7 @@ export const CA_STREET_TYPES_EN: ReadonlySet<string> = new Set([
 	"green",
 	"bay",
 	"cove",
-	"gate",
+	"check",
 	"point",
 	"ridge",
 	"view",
@@ -86,14 +88,10 @@ export const CA_STREET_TYPES_FR: ReadonlySet<string> = new Set([
 ])
 
 /**
- * Strip diacritics + lowercase so `Côte`/`cote`, `Allée`/`allee`, `Crescent`/`crescent` key alike.
+ * {@link foldToken}, letters only, so `Côte`/`cote`, `Allée`/`allee`, `Crescent`/`crescent` key alike.
  */
-function foldToken(s: string): string {
-	return s
-		.toLowerCase()
-		.normalize("NFD")
-		.replaceAll(/[\u0300-\u036F]/g, "")
-		.replaceAll(/[^a-z]/g, "")
+function foldLetters(s: string): string {
+	return foldToken(s).replaceAll(/[^a-z]/g, "")
 }
 
 /**
@@ -103,11 +101,11 @@ const STREET_WORD_SET: ReadonlySet<string> = (() => {
 	const out = new Set<string>()
 
 	for (const w of CA_STREET_TYPES_EN) {
-		out.add(foldToken(w))
+		out.add(foldLetters(w))
 	}
 
 	for (const w of CA_STREET_TYPES_FR) {
-		out.add(foldToken(w))
+		out.add(foldLetters(w))
 	}
 
 	return out
@@ -120,7 +118,7 @@ const STREET_WORD_SET: ReadonlySet<string> = (() => {
  */
 export function isCanadianStreetWord(token: unknown): boolean {
 	if (typeof token !== "string") return false
-	const t = foldToken(token)
+	const t = foldLetters(token)
 
 	return t.length > 0 && STREET_WORD_SET.has(t)
 }
@@ -154,7 +152,7 @@ export const CA_DIRECTIONALS: Record<string, "N" | "S" | "E" | "W"> = {
  */
 export function isCanadianDirectional(token: unknown): boolean {
 	if (typeof token !== "string") return false
-	const t = foldToken(token)
+	const t = foldLetters(token)
 
 	if (!t.length) return false
 

package/{country → lib/country}/codes.ts

@@ -4,7 +4,7 @@
  * @author Teffen Ellis, et al.
  */
 
-import type { CountryName } from "./names.ts"
+import type { CountryName } from "#country/names"
 
 /**
  * @category Country

package/{country → lib/country}/country.ts

@@ -3,18 +3,19 @@
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
  *
- *   Country recognition for the `country` parity lever. The ISO 3166-1 base (names + alpha-2/alpha-3)
+ *   Country recognition for the `country` parity change. The ISO 3166-1 base (names + alpha-2/alpha-3)
  *   is salvaged from isp-nexus `spatial/countries` ({@link ./names.ts}, {@link ./codes.ts}); this
  *   adds the layer ISO doesn't carry — the **surface forms** addresses actually use (endonyms +
  *   common abbreviations: "USA"/"United States"/"U.S."; "Deutschland"/"Germany"; "España"/"Spain")
- *   — plus a {@link matchCountry} resolver the corpus country-shard + parsing reuse. Same shape as
+ *   — plus a {@link matchCountry} resolver the corpus country-extract + parsing reuse. Same shape as
  *   the other codex matchers (street-suffix, directional, po-box).
  */
 
-import { Alpha3ToCountryRecord, CountryISO2 } from "./codes.ts"
-import type { CountryName } from "./names.ts"
+import { Alpha3ToCountryRecord, CountryISO2 } from "#country/codes"
+import type { CountryName } from "#country/names"
+import { foldName } from "#normalize"
 
-export { Alpha3ToCountryRecord, CountryISO2, type CountryISO3 } from "./codes.ts"
+export { Alpha3ToCountryRecord, CountryISO2, type CountryISO3 } from "#country/codes"
 
 /**
  * Common real-address surface forms per ISO 3166-1 alpha-2, **canonical English name first** then endonym +
@@ -51,9 +52,11 @@ export const ISO2_TO_NAME: ReadonlyMap<string, CountryName> = new Map(
 )
 
 /**
- * Any recognized country surface form / canonical name / alpha-2 / alpha-3 → alpha-2 code. Built once at module load,
- * lowercase-keyed. Canonical names + codes from the ISO base, plus the curated surface forms (surface forms win on
- * collision — they're the address-facing spellings).
+ * Any recognized country surface form / canonical name / alpha-2 / alpha-3 → alpha-2 code. Built once at module load.
+ * Each surface contributes its lowercased key AND its {@link foldName}-folded key when the fold leaves anything — a
+ * non-Latin surface like `日本` survives only as its lowercased self — so accented and punctuated variants resolve.
+ * Canonical names + codes from the ISO base, plus the curated surface forms (surface forms win on collision — they're
+ * the address-facing spellings).
  */
 export const COUNTRY_LOOKUP: ReadonlyMap<string, string> = (() => {
 	const out = new Map<string, string>()
@@ -64,6 +67,12 @@ export const COUNTRY_LOOKUP: ReadonlyMap<string, string> = (() => {
 		if (key && !out.has(key)) {
 			out.set(key, iso2)
 		}
+
+		const folded = foldName(k)
+
+		if (folded && !out.has(folded)) {
+			out.set(folded, iso2)
+		}
 	}
 
 	// ISO base: canonical name + alpha-2 + alpha-3.
@@ -88,12 +97,32 @@ export const COUNTRY_LOOKUP: ReadonlyMap<string, string> = (() => {
 	for (const [iso2, forms] of Object.entries(COUNTRY_SURFACE_FORMS)) {
 		for (const f of forms) {
 			out.set(f.trim().toLowerCase(), iso2)
+
+			const folded = foldName(f)
+
+			if (folded) {
+				out.set(folded, iso2)
+			}
 		}
 	}
 
 	return out
 })()
 
+/**
+ * Probe the lookup the way it is keyed: the lowercased surface first, then the {@link foldName} fold when it is
+ * non-empty.
+ */
+function probeCountry(token: string): string | undefined {
+	const direct = COUNTRY_LOOKUP.get(token.trim().toLowerCase())
+
+	if (direct) return direct
+
+	const folded = foldName(token)
+
+	return folded ? COUNTRY_LOOKUP.get(folded) : undefined
+}
+
 /**
  * Result of a country match: the alpha-2 code, the canonical English name, and the matched surface.
  */
@@ -104,13 +133,13 @@ export interface CountryMatch {
 }
 
 /**
- * Resolve a token (surface form, canonical name, alpha-2, or alpha-3) to a country. Case-insensitive. Returns null if
- * unrecognized. Multi-word names ("United States", "Great Britain") must be passed as the whole phrase — the caller
- * decides the span; this matches it.
+ * Resolve a token (surface form, canonical name, alpha-2, or alpha-3) to a country. Case-, accent-, and
+ * punctuation-insensitive. Returns null if unrecognized. Multi-word names ("United States", "Great Britain") must be
+ * passed as the whole phrase — the caller decides the span; this matches it.
  */
 export function matchCountry(token: string | null | undefined): CountryMatch | null {
 	if (!token || typeof token !== "string") return null
-	const iso2 = COUNTRY_LOOKUP.get(token.trim().toLowerCase())
+	const iso2 = probeCountry(token)
 
 	if (!iso2) return null
 
@@ -121,11 +150,11 @@ export function matchCountry(token: string | null | undefined): CountryMatch | n
  * Case-insensitive check: is the token any recognized country form?
  */
 export function isCountryToken(token: unknown): boolean {
-	return typeof token === "string" && COUNTRY_LOOKUP.has(token.trim().toLowerCase())
+	return typeof token === "string" && probeCountry(token) !== undefined
 }
 
 /**
- * The preferred render forms for an alpha-2 (canonical first), for synth shards. Empty if none curated.
+ * The preferred render forms for an alpha-2 (canonical first), for synth extracts. Empty if none curated.
  */
 export function countrySurfaceForms(iso2: string): readonly string[] {
 	return (COUNTRY_SURFACE_FORMS as Record<string, readonly string[]>)[iso2.toUpperCase()] ?? []

package/lib/country/index.ts

@@ -0,0 +1,17 @@
+/**
+ * @copyright Sister Software
+ * @license AGPL-3.0
+ * @author Teffen Ellis, et al.
+ *
+ *   ISO 3166-1 country reference + surface-form recognition (the `country` parity change).
+ */
+
+export * from "#country/codes"
+export * from "#country/country"
+export * from "#country/display-names"
+export * from "#country/names"
+export * from "#country/official-languages"
+export * from "#country/population"
+export * from "#country/reference-data"
+export * from "#country/reference"
+export * from "#country/subdivision"

package/{country → lib/country}/reference.ts

@@ -6,12 +6,12 @@
  *   Country-reference annotators. The flag emoji is a pure function of the ISO 3166-1 alpha-2 code
  *   (two Regional Indicator Symbols); calling code + currency come from {@link COUNTRY_REFERENCE}, a
  *   table generated from mledoze/countries (provenance-tracked, not hand-typed — the
- *   no-load-bearing-trivia rule).
+ *   no-irrelevant-trivia rule).
  */
 
 import type { AnnotationSet, Annotator } from "@mailwoman/annotations"
 
-import { COUNTRY_REFERENCE } from "./reference-data.ts"
+import { COUNTRY_REFERENCE } from "#country/reference-data"
 
 const REGIONAL_INDICATOR_BASE = 0x1_f1_e6
 const A_UPPER = "A".charCodeAt(0)

package/{country → lib/country}/subdivision.ts

@@ -26,10 +26,10 @@
  *   re-keys those two existing tables into one subdivision→country view.
  */
 
-import { AU_STATE_ABBREVIATIONS } from "../au/state.ts"
-import { CA_PROVINCES } from "../ca/province.ts"
-import { foldName } from "../normalize.ts"
-import { US_STATE_BY_ABBREVIATION } from "../us/state.ts"
+import { AU_STATE_ABBREVIATIONS } from "#au/state"
+import { CA_PROVINCES } from "#ca/province"
+import { foldName } from "#normalize"
+import { US_STATE_BY_ABBREVIATION } from "#us/state"
 
 /**
  * A resolved subdivision: its ISO 3166-2 code (sans country prefix), canonical English name, and ISO 3166-1 country.

package/{de → lib/de}/index.ts

@@ -7,6 +7,6 @@
  *   (Postleitzahl), and the federal states (Bundesländer).
  */
 
-export * from "./bundesland.ts"
-export * from "./postleitzahl.ts"
-export * from "./street-type.ts"
+export * from "#de/bundesland"
+export * from "#de/postleitzahl"
+export * from "#de/street-type"

package/{es → lib/es}/codigo-postal.ts

@@ -32,20 +32,38 @@ export type CodigoPostal = Tagged<string, "CodigoPostal">
 export const CODIGO_POSTAL_PATTERN = /^\d{5}$/
 
 /**
- * Narrow a string to a {@link CodigoPostal}, or `null` when it is not one.
+ * Normalize a código-postal surface form to the bare five digits: trim surrounding whitespace (`" 28001 "` →
+ * `"28001"`). Returns null when the result is not a five-digit code.
  */
-export function parseCodigoPostal(input: string): CodigoPostal | null {
-	const s = input.trim()
+export function normalizeCodigoPostal(raw: unknown): CodigoPostal | null {
+	if (typeof raw !== "string") return null
+	const s = raw.trim()
 
 	return CODIGO_POSTAL_PATTERN.test(s) ? (s as CodigoPostal) : null
 }
 
+/**
+ * Type-predicate for a (normalized) Spanish código postal.
+ */
+export function isCodigoPostal(input: unknown): input is CodigoPostal {
+	return typeof input === "string" && CODIGO_POSTAL_PATTERN.test(input)
+}
+
+/**
+ * Narrow a string to a {@link CodigoPostal}, or `null` when it is not one.
+ *
+ * @deprecated Use {@link normalizeCodigoPostal}.
+ */
+export function parseCodigoPostal(input: string): CodigoPostal | null {
+	return normalizeCodigoPostal(input)
+}
+
 /**
  * The two-digit province prefix (`"28001"` → `"28"`), or `null` for a non-postcode. Callers map it through their own
  * province table; this module deliberately does not ship one, since the campaign that needed it only needs the shape.
  */
 export function codigoPostalProvincePrefix(input: string): string | null {
-	const code = parseCodigoPostal(input)
+	const code = normalizeCodigoPostal(input)
 
 	return code ? code.slice(0, 2) : null
 }

package/{es → lib/es}/index.ts

@@ -6,4 +6,4 @@
  *   Spanish (ES) address-system reference data.
  */
 
-export * from "./codigo-postal.ts"
+export * from "#es/codigo-postal"

package/{fr → lib/fr}/cedex.ts

@@ -9,7 +9,7 @@
  *   optionally followed by a 1–2 digit office number. The component is the `CEDEX [NN]` phrase
  *   itself (the schema's `cedex` tag); the preceding postcode/locality keep their own tags.
  *
- *   This slice closes the gap PR #516 documented: the shard builder sourced the shape from SCHEMA.mdx
+ *   This slice closes the gap PR #516 documented: the extract builder sourced the shape from SCHEMA.mdx
  *   prose because codex had no cedex home. Now it does — the builder and any future consumer import
  *   from here (the provenance-first discipline: one provenanced source).
  */

package/{fr → lib/fr}/code-postal.ts

@@ -26,8 +26,8 @@
 
 import type { Tagged } from "type-fest"
 
-import { departementInfo, type DepartementCode, type DepartementInfo } from "./departement.ts"
-import { FR_REGIONS, type FrenchRegionInfo } from "./region.ts"
+import { departementInfo, type DepartementCode, type DepartementInfo } from "#fr/departement"
+import { FR_REGIONS, type FrenchRegionInfo } from "#fr/region"
 
 /**
  * A French postcode: five digits (`75008`). Same shape as a US ZIP or a German PLZ — the shape alone does not

package/{fr → lib/fr}/departement.ts

@@ -11,7 +11,7 @@
  *   département. This table is therefore the hinge between `code-postal.ts` and `region.ts`.
  */
 
-import type { FrenchRegionCode } from "./region.ts"
+import type { FrenchRegionCode } from "#fr/region"
 
 /**
  * Per-département record: code (2-digit, or `2A`/`2B`, or 3-digit DOM) + name + its région.
@@ -146,7 +146,10 @@ export type DepartementCode = keyof typeof FR_DEPARTEMENTS
 /**
  * Look up a département by code (case-insensitive for the Corsica `2A`/`2B` letters); null if unknown.
  */
-export function departementInfo(code: string | null | undefined): DepartementInfo | null {
+// `unknown`, not `string | null | undefined`: this function's whole job is to answer null for anything that is not a
+// departement code, and its callers hand it values off a CSV row or a JSON body. A narrower parameter did not make
+// those callers safer — it made the test that proves the guard work assert its way past the signature.
+export function departementInfo(code: unknown): DepartementInfo | null {
 	if (!code || typeof code !== "string") return null
 	const key = code.trim().toUpperCase()
 

package/{fr → lib/fr}/index.ts

@@ -7,8 +7,8 @@
  *   postal), and the admin hierarchy of départements and régions.
  */
 
-export * from "./cedex.ts"
-export * from "./code-postal.ts"
-export * from "./departement.ts"
-export * from "./region.ts"
-export * from "./voie.ts"
+export * from "#fr/cedex"
+export * from "#fr/code-postal"
+export * from "#fr/departement"
+export * from "#fr/region"
+export * from "#fr/voie"

package/{fr → lib/fr}/region.ts

@@ -13,7 +13,7 @@
  *   `code-postal.ts`).
  */
 
-import { foldName } from "../normalize.ts"
+import { foldName } from "#normalize"
 
 /**
  * Per-region record: ISO 3166-2:FR code (sans `FR-` prefix) + French name.

package/{fr → lib/fr}/voie.ts

@@ -17,6 +17,8 @@
  *   {@link isFrenchStreetWord} matches a whole token rather than a suffix.
  */
 
+import { foldToken } from "#normalize"
+
 /**
  * Canonical French voie type → common written abbreviations. The leading word of a French street name. The first entry
  * of each list is the most common abbreviation where one exists.
@@ -65,19 +67,13 @@ export type FrenchVoieType = keyof typeof FR_VOIE_TYPES
  * matching. `Allée`/`allee`/`all` all resolve here.
  */
 const VOIE_TOKEN_SET: ReadonlySet<string> = (() => {
-	const fold = (s: string): string =>
-		s
-			.toLowerCase()
-			.normalize("NFD")
-			.replaceAll(/[\u0300-\u036F]/g, "")
-
 	const out = new Set<string>()
 
 	for (const canonical of Object.keys(FR_VOIE_TYPES) as FrenchVoieType[]) {
-		out.add(fold(canonical))
+		out.add(foldToken(canonical))
 
 		for (const abbr of FR_VOIE_TYPES[canonical]) {
-			out.add(fold(abbr))
+			out.add(foldToken(abbr))
 		}
 	}
 
@@ -92,11 +88,7 @@ const VOIE_TOKEN_SET: ReadonlySet<string> = (() => {
 export function isFrenchStreetWord(token: unknown): boolean {
 	if (typeof token !== "string") return false
 
-	const t = token
-		.toLowerCase()
-		.normalize("NFD")
-		.replaceAll(/[\u0300-\u036F]/g, "")
-		.replaceAll(/[^a-z-]/g, "")
+	const t = foldToken(token).replaceAll(/[^a-z-]/g, "")
 
 	return t.length > 0 && VOIE_TOKEN_SET.has(t)
 }

package/{gb → lib/gb}/country.ts

@@ -14,6 +14,8 @@
  *   postcode is the thing that actually carries the geography.
  */
 
+import { foldName } from "#normalize"
+
 /**
  * Per-country record: ISO 3166-2:GB code (sans `GB-` prefix) + English name.
  */
@@ -52,16 +54,6 @@ export function isUkCountryCode(input: unknown): input is UkCountryCode {
 	return typeof input === "string" && COUNTRY_CODE_SET.has(input.toUpperCase())
 }
 
-/**
- * Lowercase + collapse non-alphanumerics so `Northern Ireland`, `northern-ireland` key alike.
- */
-function foldName(s: string): string {
-	return s
-		.toLowerCase()
-		.replaceAll(/[^a-z0-9]+/g, " ")
-		.trim()
-}
-
 /**
  * Folded country name / code → ISO 3166-2:GB code, so a surface form maps regardless of casing.
  */

package/{gb → lib/gb}/index.ts

@@ -8,7 +8,7 @@
  *   vocabulary.
  */
 
-export * from "./country.ts"
-export * from "./postcode-area.ts"
-export * from "./postcode.ts"
-export * from "./street-type.ts"
+export * from "#gb/country"
+export * from "#gb/postcode-area"
+export * from "#gb/postcode"
+export * from "#gb/street-type"

package/{gb → lib/gb}/postcode-area.ts

@@ -22,7 +22,7 @@
  *   a UK postcode is not a county.
  */
 
-import type { UkCountryCode } from "./country.ts"
+import type { UkCountryCode } from "#gb/country"
 
 /**
  * Northern Ireland is a single postcode area: BT (Belfast).

package/{gb → lib/gb}/street-type.ts

@@ -51,7 +51,7 @@ export const GB_STREET_TYPES = [
 	"vale",
 	"wharf",
 	"yard",
-	"gate",
+	"check",
 	"croft",
 	"dene",
 	"end",

package/{index.ts → lib/index.ts}

@@ -25,25 +25,26 @@ export {
 	ADDRESS_SYSTEM_CONVENTIONS,
 	conventionsForSystem,
 	type AddressSystemConventions,
-} from "./address-system-conventions.ts"
+} from "#address-system-conventions"
 
-export * from "./normalize.ts"
-export * as au from "./au/index.ts"
-export * as ca from "./ca/index.ts"
-export * as de from "./de/index.ts"
-export * as fr from "./fr/index.ts"
-export * as gb from "./gb/index.ts"
-export * as jp from "./jp/index.ts"
-export * as levels from "./level-semantics.ts"
-export * as nz from "./nz/index.ts"
+export * from "#normalize"
+export * as au from "#au/index"
+export * as ca from "#ca/index"
+export * as de from "#de/index"
+export * as fr from "#fr/index"
+export * as gb from "#gb/index"
+export * as jp from "#jp/index"
+export * as levels from "#level-semantics"
+export * as nz from "#nz/index"
 
 export {
 	AREA_POSTCODE_FINER_THAN_LOCALITY,
 	areaPostcodeLeadsLocality,
 	candidateSystemsForPostcode,
 	isUnitGradePostcodeHit,
+	SYSTEM_CODES,
 	type SystemCode,
 	UNIT_GRADE_POSTCODE,
-} from "./postcode-systems.ts"
+} from "#postcode-systems"
 
-export * as us from "./us/index.ts"
+export * as us from "#us/index"