@mailwoman/corpus 10.0.0 → 10.2.0

package/out/runner.js

@@ -3,54 +3,74 @@
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
  *
- *   Adapter runner — drives a `CorpusAdapter` to completion and writes intermediate JSONL + a
- *   per-slice manifest.
- *
- *   Output layout under `outputDir`:
- *
- *   ```
- *   <outputDir>/<adapter.id>/
- *   canonical.jsonl       # one row per line, in emission order
- *   MANIFEST.json         # adapter id, version, row count, sha256, license, started_at, ended_at
- * ```
- *
- *   The runner is responsible for everything an adapter is **not** responsible for:
- *
- *   - Stamping `corpus_version` on every row (adapters must NOT set it).
- *   - Applying `canonicalDedupKey` and skipping duplicates.
- *   - Streaming sha256 over JSONL bytes so the manifest checksum doesn't require a re-read.
- *   - Honoring backpressure on the output write stream.
- *   - Counting + emitting periodic progress to an optional callback.
- *   - Honoring `signal` (delegates to adapter's iteration boundary).
- *
- *   The runner does NOT perform alignment, tokenization, synthesis, or slicing into Parquet. Those
- *   steps run later, consuming the JSONL slices this writes.
+ *   Adapter runner — drives a `CorpusAdapter` to completion and writes `canonical.jsonl` plus a
+ *   `MANIFEST.json` per adapter. It does not align, tokenize, synthesize, or write Parquet.
  */
+import { isAlpha2CodeShape } from "@mailwoman/codex/country";
 import { openWriteStream } from "@mailwoman/core/fs/streams";
 import { writeLocalJSONFile, makeDirectories } from "@mailwoman/core/fs/writers";
-import { join } from "path-ts";
-import { canonicalDedupKey, streamingSha256 } from "#adapters/utils";
+import { stringifyJSON } from "@mailwoman/core/json";
+import { resolvePathBuilder } from "path-ts";
+import { canonicalDedupKey } from "#adapters/dedup-key";
+import { streamingSha256 } from "#adapters/sha256-stream";
+import { FingerprintSet } from "#fingerprints";
 /**
- * Drive a single adapter to completion.
+ * Base-2 logarithm of the fingerprint table's slot count.
  *
- * Returns the manifest describing the run. Writes `canonical.jsonl` + `MANIFEST.json` under `outputDir/<adapter.id>/`.
- * Throws if the output directory cannot be created, if a row arrives with a missing required field, or if the abort
- * signal fires.
+ * 2^27 slots hold 93,952,409 keys before the load limit.
+ * The largest measured adapter has 57,570,829 distinct keys.
+ * The table occupies 2.0 GiB outside the V8 heap.
+ */
+export const DEFAULT_DEDUP_SLOTS_LOG2 = 27;
+/**
+ * How many distinct dedup keys a `Set`-backed run holds before it stops adding new ones.
+ *
+ * A V8 `Set` refuses a 16,777,216th entry outright, so this cap was a real bound rather than a preference.
+ * It applies only to a run that opts out of the fingerprint table
+ * through {@linkcode RunAdapterOptions.dedupMaxSize}.
+ */
+export const DEFAULT_DEDUP_MAX_SIZE = 10_000_000;
+/**
+ * Where a run held its dedup keys.
+ */
+export const DedupStore = {
+    /**
+     * 128-bit fingerprints in a flat `Uint32Array`, bounded by the array the run sized.
+     */
+    FingerprintTable: "fingerprint-table",
+    /**
+     * A V8 `Set` of key strings, capped because V8 refuses a 16,777,216th entry.
+     */
+    CappedSet: "capped-set",
+};
+/**
+ * Drive a single adapter to completion, writing its jsonl and manifest under `outputDir/<adapter.id>/`.
  */
 export async function runAdapter(opts) {
-    const { adapter, adapterOptions, outputDir, corpusVersion } = opts;
+    const { adapter, outputDir, corpusVersion } = opts;
+    // A caller that passes its own map reads the counts back from it.
+    // Otherwise the runner supplies one, so every manifest records the adapter's drop reasons.
+    const dropped = opts.adapterOptions.dropped ?? new Map();
+    const adapterOptions = { ...opts.adapterOptions, dropped };
     const progressEvery = opts.progressEvery ?? 1000;
-    const adapterDir = join(outputDir, adapter.id);
+    const adapterDir = resolvePathBuilder(outputDir, adapter.id);
     await makeDirectories(adapterDir);
-    const jsonlPath = join(adapterDir, "canonical.jsonl");
-    const manifestPath = join(adapterDir, "MANIFEST.json");
+    const jsonlPath = adapterDir("canonical.jsonl");
+    const manifestPath = adapterDir("MANIFEST.json");
     const startedAt = new Date();
     const t0 = performance.now();
     const stream = openWriteStream(jsonlPath, { encoding: "utf8" });
     const hasher = streamingSha256();
-    const seen = new Set();
-    const DEDUP_MAX_SIZE = 10_000_000;
+    // The `Set` path serves callers that cannot accept a fingerprint collision dropping a legitimate row.
+    // A test also uses it to reach the capped behavior in three rows.
+    // Every other run takes the table.
+    // Its entry count is bounded by the array it sized rather than by V8's `Set` limit.
+    const capped = opts.dedupMaxSize !== undefined;
+    const seen = capped ? new Set() : null;
+    const fingerprints = capped ? null : new FingerprintSet(opts.dedupSlotsLog2 ?? DEFAULT_DEDUP_SLOTS_LOG2);
+    const dedupMaxSize = opts.dedupMaxSize ?? DEFAULT_DEDUP_MAX_SIZE;
     let dedupExhausted = false;
+    let dedupExhaustedAtYielded = null;
     let yielded = 0;
     let written = 0;
     let bytes = 0;
@@ -70,24 +90,54 @@ export async function runAdapter(opts) {
             }
             yielded++;
             assertEmittedRow(adapter, row);
-            const stamped = { ...row, corpus_version: corpusVersion };
+            const stamped = {
+                ...row,
+                // The rename is the runner's, after `assertEmittedRow` has held the adapter to emitting its own id.
+                source: opts.sourceName ?? row.source,
+                corpus_version: corpusVersion,
+                addressRole: row.addressRole ?? adapter.addressRole,
+                // `register` is nullable and null is a statement rather than an absence,
+                // so only an undefined field takes the adapter's declaration.
+                register: row.register === undefined ? adapter.register : row.register,
+                surface: row.surface ?? adapter.surface,
+            };
             const key = canonicalDedupKey(stamped);
-            if (!dedupExhausted) {
-                if (seen.has(key)) {
+            if (fingerprints) {
+                // The table holds every key the run has seen, so a duplicate is refused wherever it arrives.
+                if (!fingerprints.add(key)) {
                     if (yielded % progressEvery === 0) {
                         emitProgress();
                     }
                     continue;
                 }
-                if (seen.size >= DEDUP_MAX_SIZE) {
-                    dedupExhausted = true;
-                    process.stderr.write(`  runner: dedup set full at ${DEDUP_MAX_SIZE.toLocaleString()} — skipping dedup for remaining rows\n`);
+            }
+            else if (seen) {
+                // The membership test runs whether or not the set is full.
+                // The cap stops the set from growing.
+                // The set still rejects every duplicate of a key it holds.
+                // Without the membership test at the cap, duplicates of the first
+                // `dedupMaxSize` keys passed through.
+                // This ordering keeps those duplicates out.
+                if (seen.has(key)) {
+                    if (yielded % progressEvery === 0) {
+                        emitProgress();
+                    }
+                    continue;
                 }
-                else {
-                    seen.add(key);
+                if (!dedupExhausted) {
+                    if (seen.size >= dedupMaxSize) {
+                        dedupExhausted = true;
+                        dedupExhaustedAtYielded = yielded;
+                        process.stderr.write(`  runner: dedup set full at ${dedupMaxSize.toLocaleString()} keys after ${yielded.toLocaleString()} ` +
+                            `yielded rows — a later row duplicating a key already held is still dropped, and a duplicate of ` +
+                            `a key first seen from here on is written\n`);
+                    }
+                    else {
+                        seen.add(key);
+                    }
                 }
             }
-            const line = `${JSON.stringify(stamped)}\n`;
+            const line = `${stringifyJSON(stamped)}\n`;
             hasher.update(line);
             bytes += Buffer.byteLength(line, "utf8");
             written++;
@@ -103,6 +153,9 @@ export async function runAdapter(opts) {
         stream.end();
         await once(stream, "close");
     }
+    // Every adapter honors `signal` by returning instead, so without this a truncated
+    // `canonical.jsonl` would be recorded as a finished run.
+    adapterOptions.signal?.throwIfAborted();
     const endedAt = new Date();
     const elapsed_ms = performance.now() - t0;
     emitProgress();
@@ -114,9 +167,13 @@ export async function runAdapter(opts) {
         yielded,
         written,
         deduped: yielded - written,
+        dropped: Object.fromEntries([...dropped].toSorted(([a], [b]) => a.localeCompare(b))),
+        dedup_exhausted_at_yielded: dedupExhaustedAtYielded,
+        dedup_store: fingerprints ? DedupStore.FingerprintTable : DedupStore.CappedSet,
+        dedup_keys: fingerprints?.size ?? seen?.size ?? 0,
         bytes,
         sha256: hasher.digest(),
-        jsonl_path: jsonlPath,
+        jsonl_path: jsonlPath.toString(),
         started_at: startedAt.toISOString(),
         ended_at: endedAt.toISOString(),
         elapsed_ms,
@@ -125,10 +182,7 @@ export async function runAdapter(opts) {
     return manifest;
 }
 /**
- * Drive every adapter in a registry sequentially. Stops on the first failure (caller can filter the registry before
- * calling if partial-failure is desired).
- *
- * Returns the manifests in registry insertion order.
+ * Drive every adapter in a registry sequentially, stopping on the first failure.
  */
 export async function runAllAdapters(registry, common) {
     const out = [];
@@ -142,13 +196,9 @@ export async function runAllAdapters(registry, common) {
     }
     return out;
 }
-/**
- * Validate an emitted row. Cheap; runs once per row. Catches adapter bugs early so the JSONL doesn't end up
- * half-malformed.
- */
 function assertEmittedRow(adapter, row) {
     if (row.source !== adapter.id) {
-        throw new Error(`adapter ${adapter.id}: row.source must equal adapter.id (got ${JSON.stringify(row.source)})`);
+        throw new Error(`adapter ${adapter.id}: row.source must equal adapter.id (got ${stringifyJSON(row.source)})`);
     }
     if (!row.source_id) {
         throw new Error(`adapter ${adapter.id}: row.source_id is empty`);
@@ -159,14 +209,38 @@ function assertEmittedRow(adapter, row) {
     if (!row.country) {
         throw new Error(`adapter ${adapter.id}: row.country is empty for source_id=${row.source_id}`);
     }
+    // `country_weights` and every country filter use this value.
+    // Validate its ISO 3166-1 alpha-2 shape.
+    // `ZZ` and `XK` are legitimate codes even though ISO membership does not list them.
+    if (!isAlpha2CodeShape(row.country)) {
+        throw new Error(`adapter ${adapter.id}: row.country ${stringifyJSON(row.country)} is not two upper-case letters ` +
+            `for source_id=${row.source_id}. ISO 3166-1 alpha-2 is the shape country_weights and every ` +
+            `country filter key on, so a code outside it trains on nothing and matches no filter.`);
+    }
     if (!row.license) {
         throw new Error(`adapter ${adapter.id}: row.license is empty for source_id=${row.source_id}`);
     }
 }
 /**
- * Promise-ify a single event emission. Used to await `drain` / `close` on the write stream. Exported for `build.ts`,
- * whose stage streams await `close` the same way; unlike a bare two-listener race, the loser listener is detached so a
- * long-lived stream does not accumulate one orphan handler per wait.
+ * Resolve once everything written to `stream` so far has reached the file.
+ *
+ * A zero-length write acts as a barrier.
+ * Its callback runs after earlier queued writes.
+ *
+ * A caller can then record a byte offset for the bytes in the file.
+ * `drain` fires only when the buffer was full.
+ *
+ * `bytesWritten` excludes queued data.
+ * Neither value answers when all earlier writes have reached the file.
+ */
+export function flushStream(stream) {
+    return new Promise((resolve, reject) => {
+        stream.write("", (error) => (error ? reject(error) : resolve()));
+    });
+}
+/**
+ * Promise-ify a single `drain` or `close` emission, detaching the loser listener
+ * so a long-lived stream does not accumulate an orphan handler per wait.
  */
 export function once(emitter, event) {
     return new Promise((resolve, reject) => {

package/out/runner.js.map

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

package/out/sg/recipes/register.d.ts

@@ -3,38 +3,18 @@
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
  *
- *   `sg-register` slice recipe — the forms a person in Singapore types, rendered over the Overture-SG register rows
- *   (#2204 §4). The base `overture` source carries the register's own shape, `990 OLD CHOA CHU KANG ROAD, 699814,
- *   Singapore`, and the Latin model has no register for the three forms that dominate typed Singapore addresses:
- *
- *   - the HDB block line, `Blk 123 Ang Mo Kio Ave 3 #05-67 Singapore 560123` — `Blk` in front of the block number (the
- *     register's `number`), a floor-unit `#NN-NN` after the street, the country name as the locality;
- *   - the bracketed postcode, `123 Ang Mo Kio Ave 3 S(560123)` — the form the postal service prints;
- *   - the building-led line, `National Shooting Centre, 990 Old Choa Chu Kang Road, Singapore 699814` — the register's
- *     `unit` field holds the BUILDING or ESTATE name on 91,818 of 142,210 rows, which the adapter refuses as a unit and
- *     this recipe renders as a `venue` when it reads as a building rather than an estate.
- *
- *   Every value in `components` is a verbatim substring of `raw`, aligned by {@link alignAndWrite}. The floor-unit is
- *   SYNTHESIZED (the register carries one on a single row): floor 01–30, unit 01–399, zero-padded — the shape, not a
- *   real occupancy. `Blk` and the `S(` `)` around a postcode are untagged, as the board's `sg-cs-blk-12-kallang-ave`
- *   row expects (`house_number: "12"`). Streets arrive upper-case and are rendered title-cased; a third abbreviate the
- *   generic (`Avenue` → `Ave`, `Road` → `Rd`, …) the way a typed line does.
- *
- *   Run: mailwoman corpus slice sg-register --input <overture-sg.corpus.jsonl> --count N --seed S
+ *   Renders Overture Singapore address rows in the forms that people type, such as HDB block lines and `S(560123)` postcodes.
  */
 import { type CorpusRecipe } from "#recipes/scaffold";
 /**
- * `OLD CHOA CHU KANG ROAD` → `Old Choa Chu Kang Road`; an already-mixed value is returned as it is. The register writes
- * every street and building name upper-case, the same convention as G-NAF, so the G-NAF title-caser serves both.
- */
-export declare function titleCaseSGName(name: string): string;
-/**
- * Abbreviate the street's generic, wherever it sits (`Ang Mo Kio Avenue 3` → `Ang Mo Kio Ave 3`).
+ * Abbreviates the first street generic that the street contains, such as
+ * `Ang Mo Kio Avenue 3` to `Ang Mo Kio Ave 3`.
  */
 export declare function abbreviateSGStreet(street: string): string;
 /**
- * Whether the register's `unit` value names a building rather than an estate — the building-led register's lead. A name
- * carrying a digit, a parenthesized abbreviation (`DIABETES & METABOLISM CENTRE (DMC)`) or one word only is not one.
+ * Reports whether the source `unit` value looks like a building name that can lead a line.
+ *
+ * The check rejects `NIL`, single words, values with a digit or parenthesis, plus estate names.
  */
 export declare function isBuildingName(unit: string): boolean;
 interface SGRow {
@@ -44,11 +24,11 @@ interface SGRow {
     postcode: string;
 }
 /**
- * The four typed forms this recipe renders.
+ * The four typed forms that this recipe renders.
  */
 export type SGRegister = "official" | "block" | "bracket_postcode" | "building_led";
 /**
- * One rendered register: the raw line plus the components it carries, every value a substring of the line.
+ * One rendered line with its components, each of which is a substring of `raw`.
  */
 export interface SGRegisterRendering {
     raw: string;
@@ -56,13 +36,19 @@ export interface SGRegisterRendering {
     register: SGRegister;
 }
 /**
- * Render one register form for one register row. Pure: every random draw comes through `random`. A `register` names the
- * form to render instead of drawing one, for a board that wants a balanced spread; `building_led` still needs a
- * building-shaped `unit` and falls back to `official` without one.
+ * Renders one source row in a sampled or requested form.
+ *
+ * All randomness comes from `random`.
+ * A requested `building_led` form falls back to `official` when the row's `unit` is not a building name.
+ *
+ * A requested `block` form falls back to `bracket_postcode` when the row's number is not a block number.
+ * `Blk` and the `S(` and `)` around a postcode stay untagged.
  */
 export declare function renderSGRegister(row: SGRow, random: () => number, register?: SGRegister): SGRegisterRendering;
 /**
- * Slice recipe registered with the corpus builder — see the file header for the registers and why each is here.
+ * Renders each Overture Singapore corpus row from `--input` once in a sampled typed form.
+ *
+ * The recipe skips rows without a street, a block-style number, or a six-digit postcode.
  */
 export declare const sgRegisterRecipe: CorpusRecipe;
 export {};

package/out/sg/recipes/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../lib/sg/recipes/register.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAiB,KAAK,YAAY,EAA6B,MAAM,mBAAmB,CAAA;AAmD/F;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAQzD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMpD;AAED,UAAU,KAAK;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,GAAG,kBAAkB,GAAG,cAAc,CAAA;AAEnF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAClC,QAAQ,EAAE,UAAU,CAAA;CACpB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,EAAE,QAAQ,CAAC,EAAE,UAAU,GAAG,mBAAmB,CA2C7G;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAmF9B,CAAA"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../lib/sg/recipes/register.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,EAAiB,KAAK,YAAY,EAA8B,MAAM,mBAAmB,CAAA;AAqDhG;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAQzD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMpD;AAED,UAAU,KAAK;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,GAAG,kBAAkB,GAAG,cAAc,CAAA;AAEnF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAClC,QAAQ,EAAE,UAAU,CAAA;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,EAAE,QAAQ,CAAC,EAAE,UAAU,GAAG,mBAAmB,CA2C7G;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,YA2F9B,CAAA"}

package/out/sg/recipes/register.js

@@ -3,31 +3,18 @@
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
  *
- *   `sg-register` slice recipe — the forms a person in Singapore types, rendered over the Overture-SG register rows
- *   (#2204 §4). The base `overture` source carries the register's own shape, `990 OLD CHOA CHU KANG ROAD, 699814,
- *   Singapore`, and the Latin model has no register for the three forms that dominate typed Singapore addresses:
- *
- *   - the HDB block line, `Blk 123 Ang Mo Kio Ave 3 #05-67 Singapore 560123` — `Blk` in front of the block number (the
- *     register's `number`), a floor-unit `#NN-NN` after the street, the country name as the locality;
- *   - the bracketed postcode, `123 Ang Mo Kio Ave 3 S(560123)` — the form the postal service prints;
- *   - the building-led line, `National Shooting Centre, 990 Old Choa Chu Kang Road, Singapore 699814` — the register's
- *     `unit` field holds the BUILDING or ESTATE name on 91,818 of 142,210 rows, which the adapter refuses as a unit and
- *     this recipe renders as a `venue` when it reads as a building rather than an estate.
- *
- *   Every value in `components` is a verbatim substring of `raw`, aligned by {@link alignAndWrite}. The floor-unit is
- *   SYNTHESIZED (the register carries one on a single row): floor 01–30, unit 01–399, zero-padded — the shape, not a
- *   real occupancy. `Blk` and the `S(` `)` around a postcode are untagged, as the board's `sg-cs-blk-12-kallang-ave`
- *   row expects (`house_number: "12"`). Streets arrive upper-case and are rendered title-cased; a third abbreviate the
- *   generic (`Avenue` → `Ave`, `Road` → `Rd`, …) the way a typed line does.
- *
- *   Run: mailwoman corpus slice sg-register --input <overture-sg.corpus.jsonl> --count N --seed S
+ *   Renders Overture Singapore address rows in the forms that people type, such as HDB block lines and `S(560123)` postcodes.
  */
+import { stringifyJSON } from "@mailwoman/core/json";
 import { mulberry32 as makeMulberry32 } from "@mailwoman/core/utils";
-import { titlecase } from "#au/adapters/gnaf/assemble";
-import { alignAndWrite, readTuples, sliceSourceID } from "#recipes/scaffold";
-const SOURCE = "synth-sg-register";
+import { titleCaseIfUpper } from "spliterator";
+import { alignAndWrite, readTuples, recipeSourceID } from "#recipes/scaffold";
+import { defaultRecipeSource } from "#recipes/sources";
+import { SourceRegister } from "#registers";
+import { SurfaceOrigin } from "#types";
+const SOURCE = defaultRecipeSource("synth-sg-register");
 /**
- * The register's generics and the abbreviation a typed line uses for each.
+ * Street generics and their typed abbreviations.
  */
 const GENERIC_ABBREVIATIONS = [
     ["Avenue", "Ave"],
@@ -43,24 +30,23 @@ const GENERIC_ABBREVIATIONS = [
     ["Walk", "Wk"],
 ];
 /**
- * Estate and area names the register's `unit` field carries beside building names. A name ending in one of these is an
- * estate, which no one writes in front of an address line; a name without one reads as a building and is rendered as a
- * `venue`.
+ * Name endings that mark an estate or area in the source `unit` field.
+ *
+ * People do not write an estate name before an address line, so the recipe
+ * renders only building names as a `venue`.
  */
 const ESTATE_TAILS = ["ESTATE", "CONSERVATION AREA", "HILLS", "PARK", "GARDENS", "GARDEN", "HEIGHTS", "GROVE", "VILLE"];
-/**
- * Share of rows per register. The block line and the bracketed postcode are the two the Latin model has never seen; the
- * official line keeps the register's own shape in the mix so the block forms train beside it.
- */
+// The official form receives the probability left after the block, bracketed-postcode and building-led forms.
 const P_BLOCK = 0.4;
 const P_BRACKET_POSTCODE = 0.25;
 const P_BUILDING_LED = 0.15;
 const P_ABBREVIATE = 0.35;
 const P_UPPER = 0.1;
+// The source rarely includes a floor-unit, so the recipe synthesizes one within these bounds.
 const FLOOR_MAX = 30;
 const UNIT_MAX = 399;
 /**
- * The draw value that lands each register in the branch order below, for a caller that names the form.
+ * The draw value that selects each form in {@link renderSGRegister} when a caller requests that form.
  */
 const REGISTER_DRAW = {
     block: 0,
@@ -69,14 +55,8 @@ const REGISTER_DRAW = {
     official: 1,
 };
 /**
- * `OLD CHOA CHU KANG ROAD` → `Old Choa Chu Kang Road`; an already-mixed value is returned as it is. The register writes
- * every street and building name upper-case, the same convention as G-NAF, so the G-NAF title-caser serves both.
- */
-export function titleCaseSGName(name) {
-    return name === name.toUpperCase() ? titlecase(name) : name;
-}
-/**
- * Abbreviate the street's generic, wherever it sits (`Ang Mo Kio Avenue 3` → `Ang Mo Kio Ave 3`).
+ * Abbreviates the first street generic that the street contains, such as
+ * `Ang Mo Kio Avenue 3` to `Ang Mo Kio Ave 3`.
  */
 export function abbreviateSGStreet(street) {
     for (const [full, short] of GENERIC_ABBREVIATIONS) {
@@ -87,8 +67,9 @@ export function abbreviateSGStreet(street) {
     return street;
 }
 /**
- * Whether the register's `unit` value names a building rather than an estate — the building-led register's lead. A name
- * carrying a digit, a parenthesized abbreviation (`DIABETES & METABOLISM CENTRE (DMC)`) or one word only is not one.
+ * Reports whether the source `unit` value looks like a building name that can lead a line.
+ *
+ * The check rejects `NIL`, single words, values with a digit or parenthesis, plus estate names.
  */
 export function isBuildingName(unit) {
     const value = unit.trim().toUpperCase();
@@ -97,16 +78,20 @@ export function isBuildingName(unit) {
     return !ESTATE_TAILS.some((tail) => value.endsWith(tail));
 }
 /**
- * Render one register form for one register row. Pure: every random draw comes through `random`. A `register` names the
- * form to render instead of drawing one, for a board that wants a balanced spread; `building_led` still needs a
- * building-shaped `unit` and falls back to `official` without one.
+ * Renders one source row in a sampled or requested form.
+ *
+ * All randomness comes from `random`.
+ * A requested `building_led` form falls back to `official` when the row's `unit` is not a building name.
+ *
+ * A requested `block` form falls back to `bracket_postcode` when the row's number is not a block number.
+ * `Blk` and the `S(` and `)` around a postcode stay untagged.
  */
 export function renderSGRegister(row, random, register) {
-    const street0 = titleCaseSGName(row.street);
+    const street0 = titleCaseIfUpper(row.street);
     const street = random() < P_ABBREVIATE ? abbreviateSGStreet(street0) : street0;
     const drawn = random();
-    const building = isBuildingName(row.unit) ? titleCaseSGName(row.unit) : null;
-    const draw = register === undefined ? drawn : REGISTER_DRAW[register];
+    const building = isBuildingName(row.unit) ? titleCaseIfUpper(row.unit) : null;
+    const draw = register ? REGISTER_DRAW[register] : drawn;
     let raw;
     let rendered;
     const components = { house_number: row.number, street, postcode: row.postcode };
@@ -143,7 +128,9 @@ export function renderSGRegister(row, random, register) {
     return { raw, components, register: rendered };
 }
 /**
- * Slice recipe registered with the corpus builder — see the file header for the registers and why each is here.
+ * Renders each Overture Singapore corpus row from `--input` once in a sampled typed form.
+ *
+ * The recipe skips rows without a street, a block-style number, or a six-digit postcode.
  */
 export const sgRegisterRecipe = {
     name: "sg-register",
@@ -179,7 +166,7 @@ export const sgRegisterRecipe = {
             const rendering = renderSGRegister({ street, number, unit, postcode }, random);
             if (opts.golden) {
                 const golden = { raw: rendering.raw, components: rendering.components, country: "SG", locale: "en-SG" };
-                write(JSON.stringify(golden) + "\n");
+                write(stringifyJSON(golden));
                 emitted++;
                 registers[rendering.register] = (registers[rendering.register] ?? 0) + 1;
                 continue;
@@ -190,10 +177,18 @@ export const sgRegisterRecipe = {
                 country: "SG",
                 locale: "en-SG",
                 source,
-                source_id: sliceSourceID(source, { raw: rendering.raw }),
+                source_id: recipeSourceID(source, { raw: rendering.raw }),
                 corpus_version: "0.1.0",
                 license: "CDLA-Permissive-2.0 — Overture Maps addresses over the Singapore Open Data Licence 1.0 (OneMap / Singapore Land Authority)",
-            }, `sg-register:${rendering.register}`);
+            }, `sg-register:${rendering.register}`, 
+            // The values come from Overture and the recipe chose only their arrangement,
+            // so the Overture record behind each row is what `baseSourceID` names
+            // when the tuples file includes its id.
+            {
+                register: SourceRegister.Overture,
+                surface: SurfaceOrigin.Composed,
+                baseSourceID: tuple.sourceID ?? null,
+            });
             if (ok) {
                 emitted++;
                 registers[rendering.register] = (registers[rendering.register] ?? 0) + 1;

package/out/sg/recipes/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../lib/sg/recipes/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../lib/sg/recipes/register.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAqB,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAEtC,MAAM,MAAM,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAA;AAEvD;;GAEG;AACH,MAAM,qBAAqB,GAA0D;IACpF,CAAC,QAAQ,EAAE,KAAK,CAAC;IACjB,CAAC,MAAM,EAAE,IAAI,CAAC;IACd,CAAC,QAAQ,EAAE,IAAI,CAAC;IAChB,CAAC,OAAO,EAAE,IAAI,CAAC;IACf,CAAC,UAAU,EAAE,MAAM,CAAC;IACpB,CAAC,MAAM,EAAE,IAAI,CAAC;IACd,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,SAAS,EAAE,KAAK,CAAC;IAClB,CAAC,OAAO,EAAE,IAAI,CAAC;IACf,CAAC,OAAO,EAAE,IAAI,CAAC;IACf,CAAC,MAAM,EAAE,IAAI,CAAC;CACd,CAAA;AAED;;;;;GAKG;AACH,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;AAEvH,8GAA8G;AAC9G,MAAM,OAAO,GAAG,GAAG,CAAA;AACnB,MAAM,kBAAkB,GAAG,IAAI,CAAA;AAC/B,MAAM,cAAc,GAAG,IAAI,CAAA;AAC3B,MAAM,YAAY,GAAG,IAAI,CAAA;AACzB,MAAM,OAAO,GAAG,GAAG,CAAA;AAEnB,8FAA8F;AAC9F,MAAM,SAAS,GAAG,EAAE,CAAA;AACpB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB;;GAEG;AACH,MAAM,aAAa,GAA+B;IACjD,KAAK,EAAE,CAAC;IACR,gBAAgB,EAAE,OAAO;IACzB,YAAY,EAAE,OAAO,GAAG,kBAAkB;IAC1C,QAAQ,EAAE,CAAC;CACX,CAAA;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAChD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,qBAAqB,EAAE,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,GAAG,CAAC,CAAA;QAEhD,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAChE,CAAC;IAED,OAAO,MAAM,CAAA;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY;IAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAEvC,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAE1F,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;AAC1D,CAAC;AAuBD;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAU,EAAE,MAAoB,EAAE,QAAqB;IACvF,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5C,MAAM,MAAM,GAAG,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC9E,MAAM,KAAK,GAAG,MAAM,EAAE,CAAA;IACtB,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC7E,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAEvD,IAAI,GAAW,CAAA;IACf,IAAI,QAAoB,CAAA;IACxB,MAAM,UAAU,GAA2B,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAA;IAEvG,IAAI,IAAI,GAAG,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACvD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QAC3E,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QAC3E,MAAM,IAAI,GAAG,IAAI,KAAK,IAAI,MAAM,EAAE,CAAA;QAElC,GAAG,GAAG,OAAO,GAAG,CAAC,MAAM,IAAI,MAAM,IAAI,IAAI,cAAc,GAAG,CAAC,QAAQ,EAAE,CAAA;QACrE,UAAU,CAAC,IAAI,GAAG,IAAI,CAAA;QACtB,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAA;QACjC,QAAQ,GAAG,OAAO,CAAA;IACnB,CAAC;SAAM,IAAI,IAAI,GAAG,OAAO,GAAG,kBAAkB,EAAE,CAAC;QAChD,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,MAAM,MAAM,GAAG,CAAC,QAAQ,GAAG,CAAA;QAClD,QAAQ,GAAG,kBAAkB,CAAA;IAC9B,CAAC;SAAM,IAAI,IAAI,GAAG,OAAO,GAAG,kBAAkB,GAAG,cAAc,IAAI,QAAQ,EAAE,CAAC;QAC7E,GAAG,GAAG,GAAG,QAAQ,KAAK,GAAG,CAAC,MAAM,IAAI,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,CAAA;QACvE,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAA;QAC3B,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAA;QACjC,QAAQ,GAAG,cAAc,CAAA;IAC1B,CAAC;SAAM,CAAC;QACP,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,IAAI,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,CAAA;QACzD,UAAU,CAAC,QAAQ,GAAG,WAAW,CAAA;QACjC,QAAQ,GAAG,UAAU,CAAA;IACtB,CAAC;IAED,IAAI,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;QACxB,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;QAEvB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,UAAU,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAE,CAAC,WAAW,EAAE,CAAA;QACjD,CAAC;IACF,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;AAC/C,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC7C,IAAI,EAAE,aAAa;IACnB,WAAW,EACV,2IAA2I;IAC5I,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE;QACR,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,8CAA8C,EAAE;QAChF,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,6EAA6E,EAAE;KAC/G;IACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAA;QAC/E,CAAC;QAED,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,IAAI,MAAM,CAAA;QACxC,MAAM,SAAS,GAA2B,EAAE,CAAA;QAC5C,IAAI,IAAI,GAAG,CAAC,CAAA;QACZ,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,IAAI,WAAW,GAAG,CAAC,CAAA;QAEnB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,IAAI,EAAE,CAAA;YAEN,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,IAAI,IAAI,CAAC,KAAK;gBAAE,MAAK;YAE5D,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAChF,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAChF,MAAM,QAAQ,GAAG,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YACtF,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;YAE1E,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3E,OAAO,EAAE,CAAA;gBAET,SAAQ;YACT,CAAC;YAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;YAE9E,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;gBAEvG,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;gBAE5B,OAAO,EAAE,CAAA;gBACT,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;gBAExE,SAAQ;YACT,CAAC;YAED,MAAM,EAAE,GAAG,aAAa,CACvB,KAAK,EACL;gBACC,GAAG,EAAE,SAAS,CAAC,GAAG;gBAClB,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,OAAO;gBACf,MAAM;gBACN,SAAS,EAAE,cAAc,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC;gBACzD,cAAc,EAAE,OAAO;gBACvB,OAAO,EACN,4HAA4H;aAC7H,EACD,eAAe,SAAS,CAAC,QAAQ,EAAE;YACnC,6EAA6E;YAC7E,sEAAsE;YACtE,wCAAwC;YACxC;gBACC,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,OAAO,EAAE,aAAa,CAAC,QAAQ;gBAC/B,YAAY,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;aACpC,CACD,CAAA;YAED,IAAI,EAAE,EAAE,CAAC;gBACR,OAAO,EAAE,CAAA;gBACT,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;YACzE,CAAC;iBAAM,CAAC;gBACP,WAAW,EAAE,CAAA;YACd,CAAC;QACF,CAAC;QAED,OAAO,CAAC,KAAK,CACZ,kBAAkB,OAAO,aAAa,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;aAC7D,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;aAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,OAAO,aAAa,WAAW,mBAAmB,IAAI,OAAO,CAC/E,CAAA;QAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;IAClC,CAAC;CACD,CAAA"}

package/out/sg/tools/fetch/acra.d.ts

@@ -3,21 +3,18 @@
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
  *
- *   Fetch Singapore's ACRA corporate-entity register from data.gov.sg: 27 monthly CSVs (one per first
- *   letter of the entity name plus "others"), 53 columns, the registered address FIELDED — `Block`,
- *   `Street Name`, `Level No`, `Unit No`, `Building Name`, `Postal Code` — which is the NPPES shape,
- *   so the corpus adapter renders the string and the spans fall out by construction. A Singapore
- *   postcode names one building, so the postcode column is also the join to the OneMap/Overture rows.
- *
- *   License: Singapore Open Data Licence version 1.0 (attribution; commercial use, modification and
- *   adaptation permitted; no share-alike). The prescribed attribution sentence goes in the manifest.
- *
- *   data.gov.sg serves a dataset in two calls: `initiate-download` prepares a signed URL and
- *   `poll-download` answers it once the export is ready.
- *
- *   Invoke via `mailwoman corpus fetch acra-sg --out-root <path>`.
+ *   Fetches Singapore ACRA corporate-entity CSVs from data.gov.sg.
+ *   The publisher includes fielded addresses in these files.
+ */
+import type { BaseFetchOptions, FetchSummary } from "#tools/fetch/download";
+/**
+ * Options for {@link fetchACRASG}.
  */
-import type { BaseFetchOptions, FetchSummary } from "#tools/fetch/download/index";
 export type FetchACRASGOptions = BaseFetchOptions;
+/**
+ * Downloads every dataset in the ACRA collection and writes a collection manifest after each file.
+ *
+ * The function skips a file that the previous manifest lists and that still exists on disk.
+ */
 export declare function fetchACRASG(options: FetchACRASGOptions, report?: (line: string) => void): Promise<FetchSummary>;
 //# sourceMappingURL=acra.d.ts.map