@mailwoman/corpus 10.1.0 → 10.2.0

package/lib/sk/tools/fetch/inspire.ts

@@ -12,15 +12,15 @@
  * this WFS as the theme's only distributions and states one condition of use, `Neuplatňujú sa žiadne
  * podmienky (CC0 Voľné dielo)`, which the address-source register elected. There is no INSPIRE ATOM
  * download service for this theme: the feeds under `inspirews.skgeodesy.sk` belong to the
- * Geodetický a kartografický ústav, which is a different publisher and a different record.
+ * Geodetický a kartografický ústav. That is a different publisher and a different record.
  *
  * `#tools/fetch/wfs-harvest` owns the page read, the appending, the manifest and the resumption.
  * What is particular to Slovakia is that an address is assembled from five feature types rather
- * than read from one, which is what shapes the layout this writes.
+ * than read from one. That shapes the layout this writes.
  *
  * ## Five types, five documents, one directory
  *
- * `ad:Address` carries a locator and references its street, its settlement part, its administrative
+ * `ad:Address` has a locator and references its street, its settlement part, its administrative
  * units and its postcode through `ad:component`. The adapter resolves those references locally
  * against an index it builds in a first pass over every document in `inputPath`, so every type has
  * to be on disk before the first address is composed. Measured 2026-10-03, `resultType=hits` past
@@ -51,7 +51,7 @@
  *
  * `CountDefault` is 5000 and no type reports 5000 features, so `statedFeatureCount` accepts each
  * type's `numberMatched` as a count rather than refusing it as a page cap. The register records one
- * response in nine that carried no `numberMatched` attribute at all;
+ * response in nine with no `numberMatched` attribute at all.
  * `readCheckedWFSFeatureCount` reads such a response as no usable count, and the harvest then ends
  * on the first page that returns no features instead of recording a wrong total.
  */
@@ -80,16 +80,18 @@ import {
 export const SK_INSPIRE_WFS = "https://rageo.minv.sk/geoserver/ad/wfs"
 
 /**
- * The output format the harvest asks for, which is the GML the adapter's markup reader takes.
+ * The output format the harvest asks for.
+ * It is the GML the adapter's markup reader takes.
  */
 export const SK_INSPIRE_OUTPUT_FORMAT = "application/gml+xml; version=3.2"
 
 /**
  * The property the pages are ordered by.
  *
- * Every AD feature type carries `ad:inspireId`, so one sort serves all five.
+ * Every AD feature type has `ad:inspireId`, so one sort serves all five.
  * Without a sort, a resumed harvest would rest on the service returning the same
- * features in the same order as the earlier run, which no WFS guarantees.
+ * features in the same order as the earlier run.
+ * No WFS guarantees that.
  */
 export const SK_INSPIRE_SORT_BY = "ad:inspireId"
 
@@ -193,9 +195,8 @@ export async function readSKInspireCapabilities(client: Pick<APIClient, "fetch">
 /**
  * The count the service states for one type, with how it was obtained.
  *
- * `statedFeatureCount` carries no count forward where the reported number equals
- * the advertised page cap, because such a number describes the largest page the
- * service will serve rather than what the type holds.
+ * `statedFeatureCount` withholds a count where the reported number equals the advertised page cap,
+ * because such a number describes the largest page the service will serve rather than what the type holds.
  * This service's cap is 5000 and no type reports 5000.
  */
 export async function readSKInspireFeatureCount(
@@ -259,7 +260,7 @@ export async function harvestSKInspireType(
 
 	options.report?.(`  ${type}: ${featureCount.count ?? "no stated count"} — ${featureCount.because}`)
 
-	return await harvestPagedWFS({
+	return harvestPagedWFS({
 		context: `${CONTEXT} ${typeName}`,
 		source: SLUG,
 		outputDir: options.outputDir,
@@ -271,8 +272,8 @@ export async function harvestSKInspireType(
 			sortBy: SK_INSPIRE_SORT_BY,
 		},
 		license: SK_INSPIRE_DEFAULT_LICENSE,
-		// The elected statement names no attribution clause.
-		// Crediting the Ministerstvo vnútra SR stays good practice.
+		// The elected statement has no attribution clause.
+		// Attribution to the Ministerstvo vnútra SR stays good practice.
 		attribution: "",
 		featureCount,
 		pageSize,
@@ -377,7 +378,7 @@ export async function fetchSKInspire(
 						)
 					}
 
-					return await harvestSKInspireType(client, {
+					return harvestSKInspireType(client, {
 						outputDir: options.outRoot(SLUG, type),
 						typeName,
 						type,

package/lib/source-register/effective-manifest.ts

@@ -380,11 +380,11 @@ export function readConfigView(text: string): EffectiveConfigView {
 
 		const indent = /^[\t ]*/.exec(raw)![0].length
 
-		if (field !== null && indent <= fieldIndent) {
+		if (field && indent <= fieldIndent) {
 			field = null
 		}
 
-		if (field === null) {
+		if (!field) {
 			const opener = /^([\t ]*)(source_weights|augment_exclude_sources):\s*(#.*)?$/.exec(raw)
 
 			if (opener) {
@@ -627,7 +627,7 @@ export function provenanceRefusals(input: {
 		)
 	}
 
-	if (input.declared === null) {
+	if (!input.declared) {
 		refusals.push(
 			`${input.packageName}: whether its declared provenance equals the ${input.manifest.trainingSources.length} ` +
 				`source(s) the audited epoch drew from is unmeasured. The model card states its attribution as prose ` +

package/lib/source-register/register.ts

@@ -53,10 +53,10 @@ const ADDRESS_ROLES = new Set<string>(Object.values(AddressRole))
 /**
  * Returns the license label that the exclude filter in `@mailwoman/corpus/utils/license` matches by prefix.
  *
- * The function returns `undefined` until someone has elected terms for the decision.
+ * The function returns `null` until someone has elected terms for the decision.
  */
-export function electedLicenseLabel(decision: LicenseDecision): string | undefined {
-	if (decision.state !== LicenseReviewState.Elected) return undefined
+export function electedLicenseLabel(decision: LicenseDecision): string | null {
+	if (decision.state !== LicenseReviewState.Elected) return null
 
 	return decision.spdx ?? decision.electedTerms
 }

package/lib/source-register/training-manifest.ts

@@ -70,7 +70,7 @@ export interface TrainingManifest {
 	 * left out as well as what went in.
 	 *
 	 * Each key is `<adapter id>:<ISO 3166-1 alpha-2>`, the pair that addresses one register source,
-	 * because one adapter can emit several jurisdictions and each carries its own license decision.
+	 * because one adapter can emit several jurisdictions and each has its own license decision.
 	 */
 	refused: Record<string, readonly string[]>
 	totalRows: number

package/lib/source-register/types.ts

@@ -179,8 +179,8 @@ export const ResearchPass = {
 	 */
 	RightsReview: "2026-09-30-rights-review",
 	/**
-	 * The decoder-exposure survey, which recorded the authoritative address source of
-	 * each jurisdiction the exposure arc admits through OpenStreetMap.
+	 * The decoder-exposure survey recorded the authoritative address source of each
+	 * jurisdiction the exposure arc admits through OpenStreetMap.
 	 * It located each authority and did not read its terms.
 	 */
 	DecoderExposureSurvey: "2026-10-03-decoder-exposure",
@@ -347,13 +347,14 @@ export interface ElectedLicense {
 	 * Every grant the publisher states, where its surfaces state more than one.
 	 *
 	 * A publisher may state different terms in its dataset metadata, its download service
-	 * and its website, and it may be offering the same material under more than
-	 * one license, which Creative Commons permits.
+	 * and its website, and it may be offering the same material under more than one license.
+	 * Creative Commons permits that.
+	 *
 	 * Where that happens, {@linkcode ElectedLicense.spdx} records the one a build filters on
 	 * and this records what the publisher actually said, so a later reviewer reads
 	 * the conflict rather than one reading presented as settled.
 	 *
-	 * Electing the strictest grant is an engineering policy for deciding what a released corpus may carry.
+	 * The engineering policy elects the strictest grant for what a released corpus may include.
 	 * It does not establish which grant governs, and `electedBecause` states
 	 * the substantive ground separately.
 	 */
@@ -498,16 +499,15 @@ export interface AddressSourceRecord {
 	sourceURL?: string
 	note?: string
 	/**
-	 * The role each of the source's address columns carries, keyed by that
-	 * column's path in the published record.
+	 * The role of each source address column, keyed by that column's path in the published record.
 	 *
 	 * A source is ineligible for ingest until at least one column has a role.
-	 * One role per source cannot describe a publication that carries two roles on one record:
+	 * One role per source cannot describe a publication that has two roles on one record:
 	 * AusTender's OCDS release gives a supplier address and a procuring-entity address on
 	 * every contracting process, and Taiwan's GCIS register gives a registered company address
 	 * and a tax-office business address in separate columns.
 	 *
-	 * A source whose every address carries one role records one entry keyed by the field that holds it.
+	 * A source whose every address has one role records one entry keyed by the field that holds it.
 	 */
 	addressRoles?: Readonly<Record<string, AddressRole>>
 	/**
@@ -529,15 +529,14 @@ export interface AddressSourceRecord {
 	/**
 	 * The id of the corpus adapter that emits this source's rows.
 	 *
-	 * A corpus row carries its adapter's id in `source` and its jurisdiction in `country`,
-	 * and the register scopes a source to one publisher in one jurisdiction,
-	 * so that pair addresses one record here.
+	 * A corpus row has its adapter's id in `source` and its jurisdiction in `country`, and the register
+	 * scopes a source to one publisher in one jurisdiction, so that pair addresses one record here.
 	 * One adapter can serve several records: the `ban` reader emits eleven jurisdictions
 	 * from one schema, and each is its own source under its own license decision.
 	 *
 	 * A source that declares no adapter produces no rows, so a build sees zero rows
 	 * under it and has none to admit or refuse.
-	 * Declaring one is what lets `readSourceEligibility` answer for a row at all.
+	 * An adapter id is what lets `readSourceEligibility` answer for a row at all.
 	 */
 	adapterID?: string
 }

package/lib/subvenue/promotions.ts

@@ -60,7 +60,7 @@ export interface SubVenuePromotion {
  * This ledger is the only input that sets `curated: true` on a machine-derived surface.
  * Rejections stay in the ledger so the system can reject duplicate proposals until new evidence arrives.
  *
- * The span proposer in `packages/neural/lib/venue-structure.ts` ships its English designators
+ * The span proposer in `packages/neural/lib/venue/structure.ts` ships its English designators
  * without a locale gate, so a rejection here guides recipes only and does not stop the proposer.
  */
 export const SUBVENUE_PROMOTIONS: readonly SubVenuePromotion[] = [

package/lib/subvenue/table.ts

@@ -5,7 +5,7 @@
  *
  * @file The sub-venue lexicon's record schema and the shipped vocabulary it is seeded from.
  *
- * The seeds mirror `neural/venue-structure.ts`. `@mailwoman/corpus` has no dependency on `@mailwoman/neural`,
+ * The seeds mirror `neural/venue/structure.ts`. `@mailwoman/corpus` has no dependency on `@mailwoman/neural`,
  * so this file declares the shipped vocabulary locally. `sub-venue-lexicon.test.ts` pins the seed values
  * and fails when either copy changes.
  */
@@ -39,7 +39,7 @@ export interface SubVenueDesignator {
 	/**
 	 * Canonical id, lowercase English.
 	 *
-	 * It matches `neural/venue-structure.ts`'s `VENUE_STRUCTURE_DESIGNATORS` wherever the two overlap.
+	 * It matches `neural/venue/structure.ts`'s `VENUE_STRUCTURE_DESIGNATORS` wherever the two overlap.
 	 */
 	id: string
 	tier: LexiconTier
@@ -186,7 +186,7 @@ export interface SubVenueLexiconTable {
 }
 
 /**
- * The vocabulary that already ships in `neural/venue-structure.ts`, re-declared
+ * The vocabulary that already ships in `neural/venue/structure.ts`, re-declared
  * below for the module docstring's dependency-direction reason.
  *
  * `tier` is added here: the seven WOF placetypes plus `terminal`/`gate` are all venue-interior,
@@ -210,7 +210,7 @@ export const SHIPPED_DESIGNATOR_SEED: ReadonlyArray<{
 ]
 
 /**
- * The shipped positional modifiers, re-declared from `neural/venue-structure.ts`'s `VENUE_STRUCTURE_MODIFIERS`.
+ * The shipped positional modifiers, re-declared from `neural/venue/structure.ts`'s `VENUE_STRUCTURE_MODIFIERS`.
  */
 export const SHIPPED_MODIFIER_SEED: readonly string[] = [
 	"central",

package/lib/surfaces/locale.ts

@@ -125,6 +125,8 @@ const LOCALE_TAG: Record<string, string> = {
  * Other countries pass through unchanged.
  */
 function normalizePostcode(postcode: string, country: string): string {
+	// country-branch: the NL postcode is the one whose source spells it without the space the layout writes.
+	// The codex postal regimes' canonical spacing per country would replace this.
 	if (country === "NL") {
 		const m = /^(\d{4})\s*([A-Za-z]{2})$/.exec(postcode)
 

package/lib/synthesizers/anchor-absorption.ts

@@ -52,7 +52,8 @@ export interface AnchorAbsorptionSynthesisOpts {
 	 * Real US ZIP codes from the postcode-anchor lookup.
 	 *
 	 * The templates place them where the anchor fires on a token that is really a house number.
-	 * The default is the postcodes of the built-in US tuples.
+	 *
+	 * @defaultValue the postcodes of the built-in US tuples.
 	 */
 	realZips?: ReadonlyArray<string>
 }

package/lib/synthesizers/boundary-stress.ts

@@ -10,9 +10,11 @@
    synthesizer draws from is `US_TUPLES`, a hardcoded US list. The comma-less arm deliberately malforms that order.
  A layout cannot express it. The arm stresses the segmentation cue created by commas. */
 
+import { countryDisplayNames } from "@mailwoman/codex/country/display-names"
 import type { DirectionalAbbreviation } from "@mailwoman/codex/us"
 import { sample } from "@mailwoman/core/random"
 
+import { layoutAdminTail } from "#synthesizers/tail"
 import type { CanonicalRow } from "#types"
 
 /* oxlint-disable sister-software/no-unnamed-threshold -- the bare decimals below are weighted-sampler
@@ -328,7 +330,7 @@ const ALL_TEMPLATES: readonly BoundaryStressTemplate[] = [
  * When `base` is absent, the function samples a built-in US or French tuple that suits the template.
  */
 export function synthesizeBoundaryStressRow(
-	base: BoundaryStressBaseTuple | undefined,
+	base: BoundaryStressBaseTuple | null,
 	opts: BoundaryStressSynthesisOpts = {}
 ): SynthesizedBoundaryStressRow {
 	const random = opts.random ?? Math.random
@@ -339,38 +341,30 @@ export function synthesizeBoundaryStressRow(
 		const venue = random() < 0.45 ? sample(VENUES, random) : ""
 		const withCountry = random() < 0.12
 
-		if (b.country === "FR") {
-			const core = `${b.postcode} ${b.locality}${withCountry ? ", France" : ""}`
-
-			return {
-				raw: venue ? `${venue}, ${core}` : core,
-				components: {
-					...(venue ? { venue } : {}),
-					postcode: b.postcode,
-					locality: b.locality,
-					...(withCountry ? { country: "France" } : {}),
-				},
-				locale: "fr-FR",
-				template,
-			}
-		}
-
 		const withZip = random() < 0.5
-		const comma = random() < 0.6 ? "," : ""
-		// The base corpus labels this spelling as country.
-		const countryName = "United States"
-		const core = `${b.locality}${comma} ${b.region}${withZip ? ` ${b.postcode}` : ""}${withCountry ? `, ${countryName}` : ""}`
+		const comma = random() < 0.6
+		// The base corpus labels these spellings as country.
+		const countryName = countryDisplayNames(b.country, ["en"])[0] ?? b.country
+
+		// The layout renders the tail in the country's order: `75005 Paris` for FR
+		// and `Boston, MA 02116` for the US.
+		// Dropping the layout's commas is a surface perturbation that applies to any country.
+		const tail = layoutAdminTail(b.country, {
+			locality: b.locality,
+			region: b.region,
+			postcode: withZip ? b.postcode : undefined,
+			country: withCountry ? countryName : undefined,
+		})
+
+		const core = tail ? (comma ? tail.raw : tail.raw.replaceAll(", ", " ")) : b.locality
 
 		return {
 			raw: venue ? `${venue}, ${core}` : core,
 			components: {
 				...(venue ? { venue } : {}),
-				locality: b.locality,
-				region: b.region,
-				...(withZip ? { postcode: b.postcode } : {}),
-				...(withCountry ? { country: countryName } : {}),
+				...(tail ? tail.components : { locality: b.locality }),
 			},
-			locale: "en-US",
+			locale: localeFor[b.country] ?? "en-US",
 			template,
 		}
 	}

package/lib/synthesizers/house-venue.ts

@@ -6,10 +6,9 @@
  *   Generates addresses in which a house number, a street and a venue appear together.
  */
 
-/* oxlint-disable mailwoman/prefer-home -- the four admin tails below are hand-written per country on purpose. */
-
 import { sample } from "@mailwoman/core/random"
 
+import { layoutAdminTail } from "#synthesizers/tail"
 import { countryToLocale } from "#synthesizers/utils"
 import type { CanonicalRow } from "#types"
 
@@ -172,10 +171,11 @@ const COUNTRY_SURFACES: Readonly<Record<string, ReadonlyArray<string>>> = {
 }
 
 /**
- * Synthesizes one row with a house number, a street, a venue and the tuple's locality and postcode.
+ * Synthesizes one row with a house number, a street, a venue and the tuple's admin tail,
+ * rendered through the country's codex layout.
+ * A country with no layout yields `null`.
  *
  * GB rows sometimes use British venue names and ranged house numbers.
- * FR and GB rows omit the region.
  */
 export function synthesizeHouseVenueRow(
 	base: HouseVenueBaseTuple,
@@ -185,54 +185,50 @@ export function synthesizeHouseVenueRow(
 	const locale = countryToLocale(base.country)
 	const template = opts.forceTemplate ?? (random() < 0.5 ? "venue-after-street" : "venue-before-street")
 
-	const frOrder = base.country === "FR"
-	const gbOrder = base.country === "GB"
-	const veOrder = base.country === "VE"
+	// country-branch: the British venue pool and the ranged house number are GB English data.
+	// A per-country venue pool from the Overture names file would replace the branch.
+	const gbPools = base.country === "GB"
 
-	const venue = gbOrder && random() < GB_VENUE_POOL_RATE ? sample(GB_VENUES, random) : sample(PLAIN_VENUES, random)
+	const venue = gbPools && random() < GB_VENUE_POOL_RATE ? sample(GB_VENUES, random) : sample(PLAIN_VENUES, random)
 	const street = base.street ?? sample(FALLBACK_STREETS, random)
 	let houseNumber = base.houseNumber ?? randomHouseNumber(random)
 
-	if (gbOrder && random() < GB_RANGE_NUMBER_RATE && /^\d+$/.test(houseNumber)) {
+	if (gbPools && random() < GB_RANGE_NUMBER_RATE && /^\d+$/.test(houseNumber)) {
 		const start = Number.parseInt(houseNumber, 10)
 		const span = (1 + Math.floor(random() * 4)) * 2
 
 		houseNumber = `${start}-${start + span}`
 	}
 
-	const components: CanonicalRow["components"] = {
-		house_number: houseNumber,
-		street,
-		venue,
+	const countrySurfaces = COUNTRY_SURFACES[base.country]
+	const countrySurface = countrySurfaces && random() < COUNTRY_APPEND_RATE ? sample(countrySurfaces, random) : undefined
+
+	// The layout decides the tail's order and which parts it prints: FR prints no region,
+	// VE keeps the region after the postcode, GB puts the postcode after the locality.
+	const tail = layoutAdminTail(base.country, {
 		locality: base.locality,
-		...(frOrder || gbOrder ? {} : { region: base.region }),
+		region: base.region,
 		postcode: base.postcode,
-	}
-
-	let tail = frOrder
-		? `${base.postcode} ${base.locality}`
-		: gbOrder
-			? `${base.locality} ${base.postcode}`
-			: veOrder
-				? `${base.locality} ${base.postcode}, ${base.region}`
-				: `${base.locality}, ${base.region} ${base.postcode}`
+		country: countrySurface,
+	})
 
-	const countrySurfaces = COUNTRY_SURFACES[base.country]
+	if (!tail) return null
 
-	if (countrySurfaces && random() < COUNTRY_APPEND_RATE) {
-		const countrySurface = sample(countrySurfaces, random)
-		components.country = countrySurface
-		tail = `${tail}, ${countrySurface}`
+	const components: CanonicalRow["components"] = {
+		house_number: houseNumber,
+		street,
+		venue,
+		...tail.components,
 	}
 
 	let raw: string
 
 	switch (template) {
 		case "venue-after-street":
-			raw = `${houseNumber} ${street}, ${venue}, ${tail}`
+			raw = `${houseNumber} ${street}, ${venue}, ${tail.raw}`
 			break
 		case "venue-before-street":
-			raw = `${venue}, ${houseNumber} ${street}, ${tail}`
+			raw = `${venue}, ${houseNumber} ${street}, ${tail.raw}`
 			break
 	}
 

package/lib/synthesizers/no-street.ts

@@ -8,7 +8,8 @@
  *   street-like words. Output components never include street-side tags.
  */
 
-import { type ComponentDict, formatAddressRow } from "@mailwoman/codex/address/format"
+import { formatAddressRow } from "@mailwoman/codex/address/format"
+import type { ComponentDict } from "@mailwoman/codex/address/render"
 import { countryCodeForTable } from "@mailwoman/codex/country"
 import { sample } from "@mailwoman/core/random"
 

package/lib/synthesizers/po-box.ts

@@ -6,7 +6,8 @@
  *   Generates localized PO-box and private-mailbox rows in which the designator and number form one `po_box` span.
  */
 
-import { type ComponentDict, formatAddressRow } from "@mailwoman/codex/address/format"
+import { formatAddressRow } from "@mailwoman/codex/address/format"
+import type { ComponentDict } from "@mailwoman/codex/address/render"
 import { countryCodeForTable } from "@mailwoman/codex/country"
 import { sample } from "@mailwoman/core/random"
 
@@ -140,7 +141,8 @@ export interface SynthesizedPoBoxRow {
 export interface PoBoxSynthesisOpts {
 	/**
 	 * The random source.
-	 * It defaults to `Math.random`.
+	 *
+	 * @defaultValue `Math.random`
 	 */
 	random?: () => number
 	/**
@@ -151,7 +153,8 @@ export interface PoBoxSynthesisOpts {
 	pickNumber?: (random: () => number) => string
 	/**
 	 * The probability of a private-mailbox row when the locale and tuple allow one.
-	 * The default is 0.
+	 *
+	 * @defaultValue `0`
 	 */
 	pmbRatio?: number
 }

package/lib/synthesizers/tail.ts

@@ -0,0 +1,55 @@
+/**
+ * @copyright Sister Software
+ * @license AGPL-3.0
+ * @author Teffen Ellis, et al.
+ *
+ *   Renders the admin tail of a synthesized row through the country's codex address layout, so a
+ *   synthesizer writes `Chicago, IL 60613`, `75005 Paris`, `London, EC3N 1DE` or
+ *   `Maracaibo 4001, Zulia` from one call rather than from a template per country.
+ *
+ *   The layout decides which parts print: the FR layout prints no region, so a FR tail carries none
+ *   and the returned components say so. The lines the layout writes are joined with the country's
+ *   line join, which is the one-line form the corpus rows take.
+ */
+
+import { formatAddressRow } from "@mailwoman/codex/address/format"
+import { lineJoinForCountry } from "@mailwoman/codex/address/layouts"
+import type { ComponentDict } from "@mailwoman/codex/address/render"
+
+/**
+ * The admin parts a synthesizer has for a row.
+ */
+export interface AdminTailParts {
+	locality?: string
+	region?: string
+	postcode?: string
+	country?: string
+}
+
+/**
+ * A rendered tail and the parts the layout printed, with the caller's values.
+ */
+export interface RenderedTail {
+	raw: string
+	components: ComponentDict
+}
+
+/**
+ * Renders the admin parts through the layout of `country`, or returns `null`
+ * when the codex has no layout for the country or the layout prints none of the parts.
+ */
+export function layoutAdminTail(country: string, parts: AdminTailParts): RenderedTail | null {
+	const components: ComponentDict = {}
+
+	for (const [tag, value] of Object.entries(parts) as Array<[keyof AdminTailParts, string | undefined]>) {
+		if (value?.trim()) {
+			components[tag] = value
+		}
+	}
+
+	const row = formatAddressRow(components, country)
+
+	if (!row || !row.raw.trim()) return null
+
+	return { raw: row.raw.replaceAll("\n", lineJoinForCountry(country)), components: row.components }
+}