aontu 0.61.0 → 0.63.0

package/dist/exactjson.js

@@ -2,72 +2,12 @@
 /* Copyright (c) 2025 Richard Rodger, MIT License */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exactJSON = exactJSON;
-/*
- * D9 -- THE EXACT JSON EMITTER.
- *
- * `generate()` returns NATIVE values, and once a document opts into the
- * exact leaves two of them are not things `JSON.stringify` can write: a
- * biginteger generates as a native `bigint`, and a bigdecimal generates
- * as a `Decimal`. `JSON.stringify` THROWS on a bigint ("Do not know how
- * to serialize a BigInt") and a `replacer` cannot rescue it, because a
- * replacer may only return another *value* -- everything it returns that
- * is not already a JSON primitive gets quoted, so the exact digits could
- * only come back as a JSON *string*, which is a different document.
- *
- * JSON itself was never the obstacle. A JSON number is arbitrary-
- * precision decimal TEXT: `{"x":9007199254740993}` is a perfectly legal
- * document that every conforming parser reads, and Go's `encoding/json`
- * already emits exactly that for a `*big.Int`. Only JavaScript's
- * serialiser stands in the way, so aontu ships its own.
- *
- * WHY THIS IS PUBLIC API and not a CLI internal: D9 promises that an
- * exact value reaches JSON as exact digits. A library consumer whose
- * document contains `0d9007199254740993` has no other supported way to
- * keep that promise -- hiding the only implementation behind the command
- * line would leave the contract unfulfillable from the library. The
- * `aontu` CLI consumes this same export (with `indent`), and so does the
- * shared suite's byte-exact `gens` mode, so there is exactly one set of
- * bytes to keep in step with the Go port.
- *
- * PARITY WITH GO. The output must match Go's
- * `json.Encoder` + `SetEscapeHTML(false)` (see specGens in
- * go/spec_test.go) byte for byte:
- *
- *   - Key order is the order `generate()` produced. Both ports already
- *     sort map keys (see the entries sort in BagVal.gen; Go's encoder
- *     sorts map keys), so neither has to sort again here.
- *   - Strings keep JavaScript's escaping, which is what the `gens` mode
- *     settled on when it turned Go's HTML escaping OFF so that `<`, `>`
- *     and `&` stay literal in both ports. U+2028/U+2029 are the one
- *     place JS and Go disagree by default -- Go escapes them, JS does
- *     not -- so they are escaped here too, which is both legal JSON and
- *     the safer output (it can be embedded in a JavaScript source).
- *   - Numbers keep JavaScript's `Number.prototype.toString` form, which
- *     is already what Go's encoder produces: fixed notation inside
- *     [1e-6, 1e21) and an unpadded, always-signed exponent outside it
- *     (`1e+21`, `1e-7`).
- *   - A bigint writes its digits; a Decimal writes its plain digit form
- *     (`1000.0`, `0.1`, `-1.5`) -- no `0d` marker, since that belongs to
- *     canon and is not JSON, but an integral bigdecimal keeps its `.0`
- *     so the JSON still shows a decimal. Go's `*Decimal.MarshalJSON`
- *     mirrors this.
- *
- * NOTE that byte-exact output CANNOT check the other half of D9: an
- * integral bigdecimal and a biginteger can serialise to different text,
- * but a biginteger and an ordinary integer serialise to the SAME text
- * while `generate()` returned the wrong runtime type. Canon pins the AST
- * kind, `gens` pins these bytes, and only the per-port API tests
- * (ts/test/exactjson.test.ts here) pin the returned object.
- */
 const Decimal_1 = require("./val/Decimal");
 const err_1 = require("./err");
 const keyorder_1 = require("./keyorder");
 // JS leaves U+2028 (LINE SEPARATOR) and U+2029 (PARAGRAPH SEPARATOR)
 // literal in a JSON string; Go's encoder escapes them. Byte parity wins.
 const LSPS_RE = new RegExp('[\u2028\u2029]', 'g');
-// JSON.stringify's `space` argument, normalised the way the spec does:
-// a number is clamped to 0..10 spaces, a string is truncated to 10
-// characters, anything else means "compact".
 function indentUnit(indent) {
     if ('number' === typeof indent) {
         const n = Math.min(10, Math.floor(indent));
@@ -84,16 +24,9 @@ function quote(s) {
     // inside an escape), so a straight replace is safe.
     return out.replace(LSPS_RE, (c) => '\u2028' === c ? '\\u2028' : '\\u2029');
 }
-// True for a value JSON.stringify omits from an object and writes as
-// `null` inside an array. generate() never produces one, but a consumer
-// splicing its own data into the result might.
 function skipped(v) {
     return undefined === v || 'function' === typeof v || 'symbol' === typeof v;
 }
-// `seen` tracks the containers on the CURRENT path only (added on entry,
-// removed on exit), so a shared subtree -- which unification can easily
-// produce -- serialises fine and only a true cycle is refused, exactly
-// as JSON.stringify does it.
 function emit(v, unit, pad, seen) {
     if (null === v) {
         return 'null';
@@ -145,35 +78,6 @@ function emit(v, unit, pad, seen) {
     else {
         const colon = '' === unit ? ':' : ': ';
         const parts = [];
-        // OWN enumerable keys, SORTED. A `for ... in` here would additionally
-        // walk the prototype chain.
-        //
-        // WHY THE SORT IS HERE AND NOT IN gen(). BagVal.gen already sorts map
-        // entries lexicographically -- and then writes them into a plain JS
-        // object, where ECMAScript throws that sort away. OrdinaryOwnPropertyKeys
-        // lists canonical ARRAY-INDEX keys first, in ascending NUMERIC order,
-        // and only then the remaining string keys in insertion order. So
-        // `{9:1,10:2}` came back out as 9 before 10, and `{"!":1,9:2}` put the
-        // digit key ahead of the punctuation one.
-        //
-        // This is not a V8 quirk and not a JSON.stringify quirk; it is the
-        // object's own key order, and it CANNOT be fixed upstream, because no
-        // JavaScript object can hold "10" before "9". The emitter is the last
-        // point that still has the freedom to choose, so it chooses here.
-        //
-        // The giveaway that it was never a design rule: only indices up to
-        // 2^32-2 are hoisted, so `{4294967295:1,4294967296:2,5:3}` emitted as
-        // 5, 4294967295, 4294967296 -- and TypeScript's own CANON, which builds
-        // text from a sorted list rather than from an object, was lexicographic
-        // all along. The port contradicted itself.
-        //
-        // Lexicographic by UTF-16 code unit, which is what `<` on JS strings
-        // does and what MapVal.canon/BagVal.gen already sort by. Go sorts map
-        // keys by UTF-8 byte, and the two orders agree on every key that stays
-        // inside the BMP; astral-plane keys are a separate, tracked divergence.
-        // CODE POINT order (cmpCodePoint), which is what Go's UTF-8 byte sort
-        // produces. A bare .sort() is UTF-16 code-unit order, which puts an
-        // astral key ahead of everything in U+E000-U+FFFF.
         for (const k of Object.keys(v).sort(keyorder_1.cmpCodePoint)) {
             const cv = v[k];
             if (skipped(cv)) {
@@ -187,41 +91,6 @@ function emit(v, unit, pad, seen) {
     seen.delete(v);
     return out;
 }
-/**
- * Serialise a value produced by `Aontu.generate()` as JSON text,
- * preserving EXACT numbers.
- *
- * Use this instead of `JSON.stringify` on generated output. A document
- * that uses the `0d` exact leaves generates native `bigint` and
- * `Decimal` values; `JSON.stringify` throws on the first and mangles the
- * second, while this emitter writes both as raw JSON numbers with their
- * exact digits -- which is what the D9 generate contract promises, and
- * what the Go port's marshallers produce for the same document.
- *
- * ```ts
- * import { Aontu, exactJSON } from 'aontu'
- *
- * const out = new Aontu().generate('x:0d9007199254740993')
- * typeof out.x           // 'bigint'
- * exactJSON(out)         // '{"x":9007199254740993}'
- * exactJSON(out, 2)      // '{\n  "x": 9007199254740993\n}'
- * JSON.stringify(out)    // TypeError: Do not know how to serialize a BigInt
- * ```
- *
- * @param value   The value to serialise -- normally `generate()` output:
- *                `null`, booleans, numbers, strings, `bigint`,
- *                `Decimal`, arrays and plain objects. An object with a
- *                `toJSON` method is asked for its replacement first
- *                (`Decimal` is handled as a number before that check).
- * @param indent  Optional indentation, with `JSON.stringify`'s `space`
- *                semantics: a number of spaces (clamped to 0..10) or a
- *                literal string. Omitted or `0` gives COMPACT output
- *                (no spaces, no newlines) -- the form the shared spec
- *                suite's `gens` mode compares byte for byte.
- * @returns       The JSON text. Unlike `JSON.stringify` this always
- *                returns a string: a top-level `undefined` is `null`.
- * @throws        {AontuError} if the value contains a reference cycle.
- */
 function exactJSON(value, indent) {
     return emit(value, indentUnit(indent), '', new Set());
 } /* node:coverage ignore next 6 */

package/dist/exactjson.js.map

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

package/dist/format.js

@@ -3,51 +3,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = format;
 exports.unifiedDiff = unifiedDiff;
-// THE SOURCE FORMATTER (docs/design/FMT.0.md): `aontu fmt`, in the
-// tradition of gofmt. One agreed form for Aontu source, so that layout
-// is never argued about and a diff shows only what changed.
-//
-// It reads the token stream the parser reads -- the lex subscriber the
-// parser stack exposes -- so it sees what the value tree throws away:
-// comments, blank lines, the quote a string used, the spelling of a
-// number. From that stream it builds a layout tree, decides the shape
-// of every container by the rules of the note's §3, and emits. Before
-// returning it re-parses what it wrote and compares the two parse
-// trees: a formatter that cannot prove its output is the same document
-// refuses rather than return it.
-//
-// Two tiers. The syntactic (P1): whitespace, commas, quotes, bare
-// keys, chains and pair elements, none of which changes the parse
-// tree. The lawful (P2), over it: repeat the prefix, and merge what
-// repeats -- rewrites that rest on the meet, each checked by the meet
-// in isolation and kept only where the engine agrees.
-//
-// The Go twin is go/format.go, function for function; the shared
-// behaviour is test/spec/fmt.tsv, executed by both spec runners.
 const aontu_1 = require("./aontu");
 const vet_1 = require("./vet");
 const template_1 = require("./template");
-// The packing budget (§3.1). It decides which of two legal spellings
-// to use, one line or several, and nothing else: the formatter never
-// breaks a line, so a value wider than this stays as wide as it is.
 const BUDGET = 80;
-// THE DEPTH BUDGET. The layout is recursive, as the tree it reads is,
-// and the canonical port's stack is finite: past the evaluation budget
-// of 1000 levels -- the depth at which unification itself refuses --
-// the formatter stops reading and refuses, so a pathological document
-// is a finding rather than a crash.
 const MAX_DEPTH = 1000;
-// EVERY INCLUDE RESOLVES TO NOTHING. The formatter reads the file it is
-// given and no other (§3.13), so `@"..."` is answered from memory with
-// an empty source: the directive parses, the include is a token like
-// any other, and no capability is needed because no file is read.
 const stubResolver = ((spec) => ({
     ...spec, kind: 'aon', full: '__fmt__.aon', src: '', found: true, search: [],
 }));
-// ONE ENGINE, ONE SUBSCRIBER. The parser's subscriber list is
-// append-only, so the subscription is made once and writes to
-// whichever sink the current parse installed; the sink is cleared
-// before the parse returns, so the check's re-parse collects nothing.
 let ENGINE;
 let SINK;
 function engine() {
@@ -55,10 +18,6 @@ function engine() {
         ENGINE = new aontu_1.Aontu({ resolver: stubResolver });
         ENGINE.lang.jsonic.sub({
             lex: (tkn) => {
-                // Spaces carry nothing the layout needs, and the end token
-                // arrives once per nested parse -- the stub's empty includes
-                // among them -- so both are dropped here rather than skipped
-                // everywhere below.
                 if (undefined !== SINK && '#SP' !== tkn.name && '#ZZ' !== tkn.name) {
                     SINK.push({ name: tkn.name, src: tkn.src, val: tkn.val, sI: tkn.sI });
                 }
@@ -148,10 +107,6 @@ class Reader {
         return KEYISH[this.name(0)] && ('#CL' === this.name(1) ||
             ('#QM' === this.name(1) && '#CL' === this.name(2)));
     }
-    // The entries of a container up to its closer, or of the document up
-    // to its end. Comments attach by the rules of §3.7: on the line of
-    // the entry that precedes them, or of the opener, they trail it;
-    // alone on a line they stand as entries and precede what follows.
     body(close, opened) {
         const body = [];
         let open;
@@ -448,11 +403,6 @@ function unwrap(root) {
 }
 // ---------------------------------------------------------------------
 // The layout
-// D1: a one-pair map in value position is written as a chain, and a
-// one-pair map as a list element as a pair element. A map whose only
-// entry is a spread keeps its braces (X-7), and one holding a comment
-// keeps them too, because the comment needs the lines. A trailing
-// comment on the map's line joins the pair's own.
 function chain(node) {
     if ('map' !== node.t || undefined !== node.open || 1 !== node.body.length ||
         'pair' !== node.body[0].t) {
@@ -467,18 +417,16 @@ function chain(node) {
 function width(s) {
     return Array.from(s).length;
 }
-function pairHead(node, tight) {
+function pairHead(node, tight, value) {
     // An alias declaration is `%name = value` at every width: the `=` is
     // an operator, and operators are spaced (§3.2).
     if (node.alias) {
         return node.key + ' = ';
     }
-    return node.key + (node.opt ? '?' : '') + (tight ? ':' : ': ');
+    const pad = !tight ||
+        (undefined !== value && '' !== value && OPENS.includes(value[0]));
+    return node.key + (node.opt ? '?' : '') + (pad ? ': ' : ':');
 }
-// The one-line spelling of a node, or undefined where it has none: a
-// comment, a blank line, a break the author kept, a string that spans
-// lines. `tight` is the inline form of a pair, `a:1`, used inside a
-// container; a statement's pair is `a: 1`.
 function inline(node, tight) {
     if (undefined !== node.trail || node.held) {
         return undefined;
@@ -489,7 +437,7 @@ function inline(node, tight) {
             return node.text.includes('\n') ? undefined : node.text;
         case 'pair': {
             const v = inline(chain(node.value), tight);
-            return undefined === v ? undefined : pairHead(node, tight) + v;
+            return undefined === v ? undefined : pairHead(node, tight, v) + v;
         }
         case 'spread': {
             // `{ &: integer }`, padded inside braces too: the marker reads as
@@ -544,11 +492,15 @@ function inlineSeq(items) {
     }
     return out;
 }
+// A value that OPENS keeps the space after the colon (§3.2); `|` is
+// tight within a line and spaced where it leads one (§3.11, §7.7).
+const OPENS = '*{[(';
+const TIGHT_OP = '|';
 function sepOf(node) {
     return node.sep ? ', ' : ' ';
 }
-// Binary operators spaced, prefixes tight (§3.11). An operand is
-// never directly after an operand: the reader ends a value there.
+// Binary operators spaced, prefixes and `|` tight (§3.11). An operand
+// is never directly after an operand: the reader ends a value there.
 function inlineExpr(items) {
     let out = '';
     for (const it of items) {
@@ -556,7 +508,7 @@ function inlineExpr(items) {
             return undefined;
         }
         if ('op' === it.t) {
-            out += ' ' + it.text + ' ';
+            out += TIGHT_OP === it.text ? it.text : ' ' + it.text + ' ';
             continue;
         }
         if ('prefix' === it.t) {
@@ -606,9 +558,6 @@ class Writer {
     since(mark) {
         return this.lines.slice(mark).concat([this.line]).map(rtrim).join('\n') + '\n';
     }
-    // A blank line above the line at an index: the gap of §3.8, opened
-    // once the statement below it turns out to be a tree. Never at the
-    // top of the page, and never a second time.
     gap(at) {
         if (0 < at && '' !== this.lines[at - 1]) {
             this.lines.splice(at, 0, '');
@@ -636,19 +585,9 @@ class Writer {
 function rtrim(s) {
     return s.replace(/ +$/, '');
 }
-// The entries of a body, one per line at the indentation, with the
-// blank lines the author kept between them (§3.8) -- never at the
-// start or the end. In STATEMENT position (`stmt`: the root, and the
-// body of a plain map that is itself the value of a statement) a pair
-// is laid out by §3.4, which may repeat its key; anywhere else -- a
-// list, an operand, an argument -- by §3.5 alone.
 function emitBody(w, body, indent, stmt, root) {
     let pending = false;
     let count = 0;
-    // Where the run being written begins: a statement, with the comments
-    // standing directly above it, so that the gap below opens ABOVE the
-    // comments rather than between them and what they describe. A blank
-    // line ends a run -- comments across a gap belong to what is above.
     let head = 0;
     let noted = false;
     for (const node of body) {
@@ -680,14 +619,6 @@ function emitBody(w, body, indent, stmt, root) {
                 w.text(' ' + e.trail);
             }
         }
-        // A TOP-LEVEL STATEMENT WRITTEN AS A TREE STANDS APART (§3.8). A
-        // document states several things -- a service, then its entities,
-        // then its errors -- and where one of them is a tree rather than a
-        // line, the eye finds it by the space around it. What counts as a
-        // tree is measured rather than guessed: the statement took more
-        // than one line to write. So `a: 1` beside `b: 2` is left alone,
-        // and this rule cannot fire below the root, where a blank line is
-        // the author's (§3.8) and nothing else.
         if (root && from < w.mark()) {
             w.gap(head);
             pending = true;
@@ -734,18 +665,6 @@ function emitValue(w, node, indent) {
             w.text(node.text);
     }
 }
-// A call, or a parenthesis, that has no one-line form or is too wide
-// for the budget. Three shapes. Arguments that are all FLAT -- none
-// holds a container -- stay on the one line however wide it is: a
-// scalar is no narrower on a line of its own, and the formatter never
-// breaks a line. The last argument HUGS the parentheses, `hide({` ...
-// `})`, `close($.E & {` ... `})`, when it is a container, or an
-// expression the author did not break that ends in one, and the
-// arguments before it fit on the opener's line: the container decides
-// its own lines. Otherwise the parenthesis opens a block: one argument
-// per line one level in, the closer alone at the opener's level. A
-// call whose last argument hugs is hugged in turn, `type(close({` ...
-// `}))`: the schema idiom.
 function emitCall(w, node, indent) {
     const items = 'call' === node.t ? node.args : node.inner;
     const open = ('call' === node.t ? node.name : '') + '(';
@@ -841,21 +760,8 @@ function emitBlock(w, open, close, node, indent, stmt) {
     w.open(indent, false);
     w.text(close);
 }
-// An expression that has no one-line form, or one too wide for the
-// budget: the author's breaks are kept, each at its operator, which
-// leads its continuation line (§3.11). The continuation is one level
-// in when the expression follows a key on its line, and level with
-// the first operand when the expression has the line to itself -- an
-// argument of a block call, say -- so a disjunction of alternatives
-// reads as the list it is. A container operand that does not fit from
-// where it stands is a block whose closer lines up with the line that
-// opened it.
 function emitExpr(w, items, indent) {
     const cont = w.fresh() ? indent : indent + 2;
-    // Whether the last item was an operand: a comment after one is a
-    // space away, and after an operator or the colon it is not. An
-    // operand is never directly after an operand (the reader ends a
-    // value there), so operands need no such check.
     let operand = false;
     let cur = indent;
     for (const it of items) {
@@ -868,7 +774,7 @@ function emitExpr(w, items, indent) {
                 w.text(it.text + ' ');
             }
             else {
-                w.text(' ' + it.text + ' ');
+                w.text(TIGHT_OP === it.text ? it.text : ' ' + it.text + ' ');
             }
             operand = false;
             continue;
@@ -892,10 +798,6 @@ function emitExpr(w, items, indent) {
         operand = true;
     }
 }
-// The entries of a plain map value: a braced map, or a chain, which is
-// a one-entry map. A map with a comment on its opener keeps its braces
-// (§3.7), so it is not plain here; nor is a map holding an include,
-// which the local check cannot follow.
 function plainEntries(v) {
     if ('pair' === v.t) {
         return [v];
@@ -921,17 +823,6 @@ function members(p) {
     const trail = undefined === last.trail ? p.trail : last.trail + ' ' + p.trail;
     return entries.slice(0, -1).concat([{ ...last, trail }]);
 }
-// Adjacent statements naming one key, whose values are plain maps, are
-// one map: their entries in order, with the comments and blank lines
-// between the statements travelling with the statement they preceded.
-// Only ADJACENT statements merge -- a `server:` line, something else,
-// then another `server:` line stays as it is, because merging them
-// would move a statement, and the formatter never reorders (§3.13).
-// Nor do two statements merge into a map with two spreads: the engine
-// keeps those as a conjunction, which is not the meet of the two maps.
-// The tree is not changed: a merged statement is a new node that keeps
-// the statements it replaces as its `orig`, its spelling before, and a
-// statement merged somewhere below is copied the same way.
 function mergeRuns(body) {
     const out = [];
     let i = 0;
@@ -993,6 +884,25 @@ function mergeDeep(p) {
     }
     return { ...p, value: 'pair' === v.t ? body[0] : { ...v, body }, orig: [p] };
 }
+function record(v, entries) {
+    if ('map' !== v.t) {
+        return false;
+    }
+    let pairs = 0;
+    for (const e of entries) {
+        if ('spread' === e.t) {
+            return false;
+        }
+        if ('pair' !== e.t) {
+            continue;
+        }
+        if (undefined !== plainEntries(e.value)) {
+            return false;
+        }
+        pairs++;
+    }
+    return 1 < pairs;
+}
 function repeatLines(entries, prefix, indent) {
     if (0 === entries.length || 'comment' === entries[entries.length - 1].t ||
         1 < entries.filter((e) => 'spread' === e.t).length) {
@@ -1033,8 +943,21 @@ function repeatLines(entries, prefix, indent) {
         if (undefined === lines) {
             return undefined;
         }
+        if (record(e.value, sub)) {
+            out.push({ t: 'block', text: head, node: e.value, trail });
+            continue;
+        }
         if ('' !== trail) {
-            lines[lines.length - 1].text += trail;
+            // Onto the last line written for this entry -- and after the
+            // CLOSER where that line is a block, which is where the trailing
+            // comment of the entry the block came from also stands.
+            const last = lines[lines.length - 1];
+            if ('block' === last.t) {
+                last.trail = (last.trail ?? '') + trail;
+            }
+            else {
+                last.text += trail;
+            }
         }
         out.push(...lines);
     }
@@ -1043,18 +966,6 @@ function repeatLines(entries, prefix, indent) {
 function fits(indent, text) {
     return indent + width(text) <= BUDGET;
 }
-// A pair in statement position, by §3.4. `prefix` is what stands
-// before it on its line: the heads of the chain it hangs from, not yet
-// written. Its value is laid out by §3.5 unless it is a plain map, and
-// then in this order: a chain, when the map holds exactly one pair
-// (D1); one line, when that fits the budget; the key repeated over the
-// entries, when every entry can be one line that way; a braced block
-// otherwise, whose entries are statements in turn. Whether the
-// statement was rewritten by this tier -- merged, or repeated -- is
-// returned, and the outermost such statement is checked: its spelling
-// on the page against what the syntactic tier writes for the
-// statements it came from, at the same indentation, which is what
-// stays on the page when the check fails.
 function emitStatement(w, p, indent, stmt, prefix) {
     const mark = w.mark();
     let rewritten = undefined !== p.orig;
@@ -1088,6 +999,15 @@ function emitStatement(w, p, indent, stmt, prefix) {
                 pending = false;
                 count++;
                 w.text(line.text);
+                if ('block' === line.t) {
+                    // The record the descent stopped at: its entries are
+                    // statements in turn, and the whole statement this repeat
+                    // belongs to is what carries the check, so they are covered.
+                    emitBlock(w, '{', '}', line.node, indent, { meet: stmt.meet, covered: true });
+                    if (undefined !== line.trail) {
+                        w.text(line.trail);
+                    }
+                }
             }
             rewritten = true;
         }
@@ -1121,11 +1041,6 @@ function emit(root, meet) {
     emitBody(w, undefined === meet ? root : mergeRuns(root), 0, undefined === meet ? undefined : { meet, covered: false }, true);
     return w.finish();
 }
-// ---------------------------------------------------------------------
-// The lint (§4): what the formatter points at and never touches. Two
-// rules, both advice: the formatter never renames a key (§4.1) and
-// never introduces an alias (§4.2), and a rule with a mechanical fix
-// that keeps the document would belong to §3 instead (§4.3).
 // The shape width at which a repeat is worth an alias (§4.2): below
 // it, `{ a:1 }` twice is the shorter spelling. Measured over the use
 // cases when the lint landed (§7.10).
@@ -1172,11 +1087,6 @@ function lineCol(text, at) {
     const before = text.slice(0, at);
     return { line: before.split('\n').length, col: at - before.lastIndexOf('\n') };
 }
-// D4 (§4.1): keys are lower-case words, or CamelCase when a key is
-// several. A bare key holding `_`, or beginning with two capitals, is
-// reported with the spelling that would follow the form; a quoted key
-// is a deliberate spelling and a key of underscores alone names
-// nothing the rule can respell.
 function keyCase(node, text, out) {
     if ('pair' === node.t && BARE.test(node.key) && /[A-Za-z]/.test(node.key)) {
         const why = node.key.includes('_') ? 'holds an underscore'
@@ -1192,9 +1102,6 @@ function keyCase(node, text, out) {
         keyCase(child, text, out);
     }
 }
-// The key as lower-case words or CamelCase: `credit_cents` is
-// `creditCents`, `HTTP_PORT` is `httpPort`, `HTTPServer` is
-// `httpServer`, `ID` is `id`.
 function camel(key) {
     const words = key.split('_').filter((w) => '' !== w)
         .map((w) => /^[A-Z]+$/.test(w) ? w.toLowerCase() : w);
@@ -1202,12 +1109,6 @@ function camel(key) {
     return head.charAt(0).toLowerCase() + head.slice(1) +
         words.slice(1).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join('');
 }
-// D3 (§4.2): a shape written twice can drift, and an alias names it
-// once. Every map or list whose shape recurs in the file, and whose
-// shape is REPEAT_MIN_WIDTH or wider, is reported once, at its first
-// site, with the count and the other sites; the naming is the
-// author's. A repeat inside a repeat is the outer one's: the walk does
-// not descend into a shape it reports.
 function repeats(nodes, text, out) {
     const counts = new Map();
     const tally = (node) => {
@@ -1242,9 +1143,6 @@ function repeats(nodes, text, out) {
         }
     }
 }
-// A node's shape: its spelling with the layout, the comments and, for
-// a map, the order of its entries taken out, so that two spellings of
-// one value are one shape, as they are one canon.
 function shape(node) {
     switch (node.t) {
         case 'map':
@@ -1280,15 +1178,6 @@ function sameDocument(root, after) {
     const p = parseDoc(after, undefined, undefined);
     return undefined === p.errors && root.canon === p.root.canon;
 }
-// The check of a lawful rewrite: the spelling before and the spelling
-// after, evaluated in isolation, come to the same canon, the same
-// kinds of failure, and the same outcome of generation (§7.3). Local,
-// so it needs no include and no capability, and it applies whether or
-// not the document as a whole evaluates. The kinds, not the count: how
-// often one unresolved reference is reported depends on the order the
-// meet took. Generation too, because the engine generates from more
-// than the canon: a meet of maps with a nil member has refused a key
-// the same map written once generates.
 function sameByMeet(before, after) {
     return meetOf(before) === meetOf(after);
 }
@@ -1330,12 +1219,6 @@ function checkFinding(path, expected, actual) {
         actual,
     };
 }
-// THE TARGET'S OWN LINES ARE HELD ON LINES OF THEIR OWN (§3.14). The
-// desugaring is line for line, so a line of output is known by the
-// offset it begins at, and the node beginning there -- the quoted
-// string the desugaring wrote -- is marked. From there on it has no
-// one-line form, so every container holding it opens, and no two lines
-// of the generated file are ever packed onto one.
 function holdOutput(nodes, at) {
     for (const node of nodes) {
         if (undefined !== node.at && at.has(node.at)) {
@@ -1363,11 +1246,6 @@ function outputAt(doc, flags) {
     }
     return at;
 }
-// A finding's column in the TEMPLATE rather than in the document it
-// carries (§3.14): the marker and its one space stand before the aontu
-// on every line the resugaring writes. Every finding is on such a
-// line -- the two rules point at a key or at a container, and a line of
-// output is a bare string, which is neither.
 function shiftFindings(findings, mark) {
     return undefined === mark ? findings :
         findings.map((f) => ({ ...f, col: f.col + mark.length + 1 }));
@@ -1377,9 +1255,6 @@ function shiftFindings(findings, mark) {
 // what `--check` and `--list` report.
 function format(src, opts, hooks) {
     const text = lf(src);
-    // A GENERATOR IS FORMATTED AS THE DOCUMENT IT CARRIES (§3.14): the
-    // template surface's two transforms stand either side of the
-    // formatter, and between them is what happens to any other document.
     const mark = opts?.template;
     const doc = undefined === mark ? text : (0, template_1.desugarTemplate)(text, mark);
     const toks = [];
@@ -1412,11 +1287,6 @@ function format(src, opts, hooks) {
         findings: opts?.lint ? shiftFindings(lintOf(root, doc), mark) : [],
     };
 }
-// The lines of a text, with a marker on the last when the text does
-// not end in a newline: such a line never equals its
-// newline-terminated twin, which is how the diff reports the
-// difference, and the marker is rendered as diff renders it. NUL,
-// which no source line ends in.
 const NO_NEWLINE = String.fromCharCode(0);
 function textLines(text) {
     if ('' === text) {
@@ -1513,8 +1383,6 @@ function patience(a, x0, x1, b, y0, y1, out) {
         out.push({ op: ' ', text: a[x1 + k] });
     }
 }
-// The diff in unified format, three lines of context, the file named
-// on both sides. Empty when the texts are the same.
 function unifiedDiff(name, before, after) {
     const a = textLines(before);
     const b = textLines(after);
@@ -1544,8 +1412,6 @@ function unifiedDiff(name, before, after) {
     for (const [s, e] of hunks) {
         const from = Math.max(s - 3, 0);
         const to = Math.min(e + 4, edits.length);
-        // Everything between two hunks is context -- a change would have
-        // opened a hunk -- so both sides advance together.
         for (; next < from; next++) {
             ai++;
             bi++;