neon 3.0.0 → 3.1.0

package/dist/psql/print/troff.js

@@ -1,240 +1,208 @@
 import { boolDisplayOf, renderCellValue } from "./units.js";
+//#region src/psql/print/troff.ts
 /**
- * Troff MS printer.
- *
- * Mirrors print.c `print_troff_ms_text` and `print_troff_ms_vertical`.
- *
- * Output shape (flat, with title and one footer):
- *   .LP
- *   .DS C
- *   title
- *   .DE
- *   .LP
- *   .TS
- *   center;
- *   l | l | r.
- *   \fIcol1\fP	\fIcol2\fP	\fIcol3\fP
- *   _
- *   val1	val2	val3
- *   .TE
- *   .DS L
- *   (N rows)
- *   .DE
- *
- * Output shape (expanded, `\pset expanded on`):
- *   .LP
- *   .TS
- *   center;
- *   c s.
- *   \fIRecord 1\fP
- *   _              # if border>=1
- *   .T&
- *   c | l.         # `c l.` when border != 1
- *   colname1	val1
- *   colname2	val2
- *   ...
- *   .T&
- *   c s.
- *   \fIRecord 2\fP
- *   ...
- *   .TE
- *   .DS L
- *   .DE
- *
- * - `topt.border` is clamped to 0..2. `border == 2` uses `center box;`;
- *   otherwise just `center;`. Border > 0 inserts ` | ` between column
- *   spec letters.
- * - Numeric columns get `r`, others `l` (per the OID heuristic).
- * - Tab is the field separator (consistent with `.TS` defaults).
- * - The only structurally-hostile character is `\\`, which becomes
- *   `\(rs` (troff's "reverse solidus" glyph). Everything else passes
- *   through verbatim — troff ms is a byte stream.
- * - Expanded mode emits a `.T&\n<spec>.\n` re-spec block between the
- *   "Record N" header (`c s.`) and the body (`c l.` / `c | l.`); under
- *   tuples-only the body spec is set once as `c l;` after the table
- *   header. No default `(N rows)` footer.
- */
-// INT2, INT4, INT8, FLOAT4, FLOAT8, NUMERIC, INTERVAL.
-const NUMERIC_OIDS = new Set([21, 23, 20, 700, 701, 1700, 1186]);
-export const troffMsPrinter = {
-    format: "troff-ms",
-    printQuery(rs, opts, out) {
-        const topt = opts.topt;
-        if (topt.expanded === "on") {
-            return printExpanded(rs, opts, out);
-        }
-        return printFlat(rs, opts, out);
-    },
+* Troff MS printer.
+*
+* Mirrors print.c `print_troff_ms_text` and `print_troff_ms_vertical`.
+*
+* Output shape (flat, with title and one footer):
+*   .LP
+*   .DS C
+*   title
+*   .DE
+*   .LP
+*   .TS
+*   center;
+*   l | l | r.
+*   \fIcol1\fP	\fIcol2\fP	\fIcol3\fP
+*   _
+*   val1	val2	val3
+*   .TE
+*   .DS L
+*   (N rows)
+*   .DE
+*
+* Output shape (expanded, `\pset expanded on`):
+*   .LP
+*   .TS
+*   center;
+*   c s.
+*   \fIRecord 1\fP
+*   _              # if border>=1
+*   .T&
+*   c | l.         # `c l.` when border != 1
+*   colname1	val1
+*   colname2	val2
+*   ...
+*   .T&
+*   c s.
+*   \fIRecord 2\fP
+*   ...
+*   .TE
+*   .DS L
+*   .DE
+*
+* - `topt.border` is clamped to 0..2. `border == 2` uses `center box;`;
+*   otherwise just `center;`. Border > 0 inserts ` | ` between column
+*   spec letters.
+* - Numeric columns get `r`, others `l` (per the OID heuristic).
+* - Tab is the field separator (consistent with `.TS` defaults).
+* - The only structurally-hostile character is `\\`, which becomes
+*   `\(rs` (troff's "reverse solidus" glyph). Everything else passes
+*   through verbatim — troff ms is a byte stream.
+* - Expanded mode emits a `.T&\n<spec>.\n` re-spec block between the
+*   "Record N" header (`c s.`) and the body (`c l.` / `c | l.`); under
+*   tuples-only the body spec is set once as `c l;` after the table
+*   header. No default `(N rows)` footer.
+*/
+const NUMERIC_OIDS = /* @__PURE__ */ new Set([
+	21,
+	23,
+	20,
+	700,
+	701,
+	1700,
+	1186
+]);
+const troffMsPrinter = {
+	format: "troff-ms",
+	printQuery(rs, opts, out) {
+		if (opts.topt.expanded === "on") return printExpanded(rs, opts, out);
+		return printFlat(rs, opts, out);
+	}
 };
 const printFlat = (rs, opts, out) => {
-    const topt = opts.topt;
-    const tuplesOnly = topt.tuplesOnly;
-    const startTable = topt.startTable;
-    const stopTable = topt.stopTable;
-    const border = clampBorder(topt.border);
-    const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
-    const title = opts.title ?? topt.title;
-    const footers = opts.footers ?? topt.footers;
-    const headers = rs.fields.map((f) => f.name);
-    const ncols = rs.fields.length;
-    const aligns = rs.fields.map((f) => NUMERIC_OIDS.has(f.dataTypeID) ? "r" : "l");
-    const boolDisplay = boolDisplayOf(topt);
-    const cells = rs.rows.map((row) => row.map((cell, i) => renderCell(cell, nullPrint, topt.numericLocale, rs.fields[i]?.dataTypeID, boolDisplay)));
-    let buf = "";
-    if (startTable) {
-        if (!tuplesOnly && title) {
-            buf += ".LP\n.DS C\n";
-            buf += escapeTroff(title);
-            buf += "\n.DE\n";
-        }
-        buf += ".LP\n.TS\n";
-        buf += border === 2 ? "center box;\n" : "center;\n";
-        aligns.forEach((a, idx) => {
-            buf += a;
-            if (border > 0 && idx < ncols - 1)
-                buf += " | ";
-        });
-        buf += ".\n";
-        if (!tuplesOnly) {
-            headers.forEach((h, idx) => {
-                if (idx !== 0)
-                    buf += "\t";
-                buf += "\\fI" + escapeTroff(h) + "\\fP";
-            });
-            buf += "\n_\n";
-        }
-    }
-    cells.forEach((row) => {
-        row.forEach((value, idx) => {
-            buf += escapeTroff(value);
-            if (idx === ncols - 1)
-                buf += "\n";
-            else
-                buf += "\t";
-        });
-    });
-    if (stopTable) {
-        buf += ".TE\n.DS L\n";
-        if (!tuplesOnly) {
-            const effective = effectiveFooters(rs, topt, footers);
-            for (const f of effective) {
-                buf += escapeTroff(f) + "\n";
-            }
-        }
-        buf += ".DE\n";
-    }
-    out.write(buf);
-    return Promise.resolve();
+	const topt = opts.topt;
+	const tuplesOnly = topt.tuplesOnly;
+	const startTable = topt.startTable;
+	const stopTable = topt.stopTable;
+	const border = clampBorder(topt.border);
+	const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
+	const title = opts.title ?? topt.title;
+	const footers = opts.footers ?? topt.footers;
+	const headers = rs.fields.map((f) => f.name);
+	const ncols = rs.fields.length;
+	const aligns = rs.fields.map((f) => NUMERIC_OIDS.has(f.dataTypeID) ? "r" : "l");
+	const boolDisplay = boolDisplayOf(topt);
+	const cells = rs.rows.map((row) => row.map((cell, i) => renderCell(cell, nullPrint, topt.numericLocale, rs.fields[i]?.dataTypeID, boolDisplay)));
+	let buf = "";
+	if (startTable) {
+		if (!tuplesOnly && title) {
+			buf += ".LP\n.DS C\n";
+			buf += escapeTroff(title);
+			buf += "\n.DE\n";
+		}
+		buf += ".LP\n.TS\n";
+		buf += border === 2 ? "center box;\n" : "center;\n";
+		aligns.forEach((a, idx) => {
+			buf += a;
+			if (border > 0 && idx < ncols - 1) buf += " | ";
+		});
+		buf += ".\n";
+		if (!tuplesOnly) {
+			headers.forEach((h, idx) => {
+				if (idx !== 0) buf += "	";
+				buf += "\\fI" + escapeTroff(h) + "\\fP";
+			});
+			buf += "\n_\n";
+		}
+	}
+	cells.forEach((row) => {
+		row.forEach((value, idx) => {
+			buf += escapeTroff(value);
+			if (idx === ncols - 1) buf += "\n";
+			else buf += "	";
+		});
+	});
+	if (stopTable) {
+		buf += ".TE\n.DS L\n";
+		if (!tuplesOnly) {
+			const effective = effectiveFooters(rs, topt, footers);
+			for (const f of effective) buf += escapeTroff(f) + "\n";
+		}
+		buf += ".DE\n";
+	}
+	out.write(buf);
+	return Promise.resolve();
 };
 const printExpanded = (rs, opts, out) => {
-    const topt = opts.topt;
-    const tuplesOnly = topt.tuplesOnly;
-    const startTable = topt.startTable;
-    const stopTable = topt.stopTable;
-    const border = clampBorder(topt.border);
-    const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
-    const title = opts.title ?? topt.title;
-    const footers = opts.footers ?? topt.footers;
-    const headers = rs.fields.map((f) => f.name);
-    const boolDisplay = boolDisplayOf(topt);
-    const cells = rs.rows.map((row) => row.map((cell, i) => renderCell(cell, nullPrint, topt.numericLocale, rs.fields[i]?.dataTypeID, boolDisplay)));
-    let buf = "";
-    // currentFormat: 0 = none yet, 1 = "Record N" header (c s),
-    // 2 = body (c l or c | l). Upstream uses the same tri-state to
-    // decide when to emit `.T&` separators.
-    let currentFormat = 0;
-    if (startTable) {
-        if (!tuplesOnly && title) {
-            buf += ".LP\n.DS C\n";
-            buf += escapeTroff(title);
-            buf += "\n.DE\n";
-        }
-        buf += ".LP\n.TS\n";
-        buf += border === 2 ? "center box;\n" : "center;\n";
-        // Under tuples-only, upstream emits a one-shot `c l;` body spec
-        // here so each Record's first .T& block is omitted.
-        if (tuplesOnly) {
-            buf += "c l;\n";
-        }
-    }
-    else {
-        // Continuation: assume body spec is already in effect.
-        currentFormat = 2;
-    }
-    let record = topt.prior + 1;
-    cells.forEach((row, rowIdx) => {
-        if (!tuplesOnly) {
-            if (currentFormat !== 1) {
-                if (border === 2 && rowIdx > 0)
-                    buf += "_\n";
-                if (currentFormat !== 0)
-                    buf += ".T&\n";
-                buf += "c s.\n";
-                currentFormat = 1;
-            }
-            buf += `\\fIRecord ${String(record)}\\fP\n`;
-            record += 1;
-        }
-        if (border >= 1)
-            buf += "_\n";
-        if (!tuplesOnly) {
-            if (currentFormat !== 2) {
-                if (currentFormat !== 0)
-                    buf += ".T&\n";
-                buf += border !== 1 ? "c l.\n" : "c | l.\n";
-                currentFormat = 2;
-            }
-        }
-        row.forEach((value, idx) => {
-            buf += escapeTroff(headers[idx]);
-            buf += "\t";
-            buf += escapeTroff(value);
-            buf += "\n";
-        });
-    });
-    if (stopTable) {
-        buf += ".TE\n.DS L\n";
-        // Expanded mode does NOT emit the default "(N rows)" footer.
-        if (!tuplesOnly && footers && footers.length > 0) {
-            for (const f of footers) {
-                buf += escapeTroff(f) + "\n";
-            }
-        }
-        buf += ".DE\n";
-    }
-    out.write(buf);
-    return Promise.resolve();
+	const topt = opts.topt;
+	const tuplesOnly = topt.tuplesOnly;
+	const startTable = topt.startTable;
+	const stopTable = topt.stopTable;
+	const border = clampBorder(topt.border);
+	const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
+	const title = opts.title ?? topt.title;
+	const footers = opts.footers ?? topt.footers;
+	const headers = rs.fields.map((f) => f.name);
+	const boolDisplay = boolDisplayOf(topt);
+	const cells = rs.rows.map((row) => row.map((cell, i) => renderCell(cell, nullPrint, topt.numericLocale, rs.fields[i]?.dataTypeID, boolDisplay)));
+	let buf = "";
+	let currentFormat = 0;
+	if (startTable) {
+		if (!tuplesOnly && title) {
+			buf += ".LP\n.DS C\n";
+			buf += escapeTroff(title);
+			buf += "\n.DE\n";
+		}
+		buf += ".LP\n.TS\n";
+		buf += border === 2 ? "center box;\n" : "center;\n";
+		if (tuplesOnly) buf += "c l;\n";
+	} else currentFormat = 2;
+	let record = topt.prior + 1;
+	cells.forEach((row, rowIdx) => {
+		if (!tuplesOnly) {
+			if (currentFormat !== 1) {
+				if (border === 2 && rowIdx > 0) buf += "_\n";
+				if (currentFormat !== 0) buf += ".T&\n";
+				buf += "c s.\n";
+				currentFormat = 1;
+			}
+			buf += `\\fIRecord ${String(record)}\\fP\n`;
+			record += 1;
+		}
+		if (border >= 1) buf += "_\n";
+		if (!tuplesOnly) {
+			if (currentFormat !== 2) {
+				if (currentFormat !== 0) buf += ".T&\n";
+				buf += border !== 1 ? "c l.\n" : "c | l.\n";
+				currentFormat = 2;
+			}
+		}
+		row.forEach((value, idx) => {
+			buf += escapeTroff(headers[idx]);
+			buf += "	";
+			buf += escapeTroff(value);
+			buf += "\n";
+		});
+	});
+	if (stopTable) {
+		buf += ".TE\n.DS L\n";
+		if (!tuplesOnly && footers && footers.length > 0) for (const f of footers) buf += escapeTroff(f) + "\n";
+		buf += ".DE\n";
+	}
+	out.write(buf);
+	return Promise.resolve();
 };
 const clampBorder = (b) => {
-    if (b > 2)
-        return 2;
-    if (b < 0)
-        return 0;
-    return b;
+	if (b > 2) return 2;
+	if (b < 0) return 0;
+	return b;
 };
 const effectiveFooters = (rs, topt, footers) => {
-    if (footers && footers.length > 0)
-        return footers;
-    if (topt.defaultFooter) {
-        const n = rs.rows.length;
-        return [`(${String(n)} ${n === 1 ? "row" : "rows"})`];
-    }
-    return [];
+	if (footers && footers.length > 0) return footers;
+	if (topt.defaultFooter) {
+		const n = rs.rows.length;
+		return [`(${String(n)} ${n === 1 ? "row" : "rows"})`];
+	}
+	return [];
 };
 const escapeTroff = (input) => {
-    // Only `\` is dangerous (it begins a troff escape). Map it to `\(rs`,
-    // which renders the reverse-solidus glyph. Newlines flow through
-    // unchanged — `.TS` treats each line as a new row, so we never want
-    // raw newlines inside a cell; that constraint is enforced upstream
-    // by the caller, not here. (`renderCell` similarly never emits a raw
-    // newline today.)
-    let out = "";
-    for (const ch of input) {
-        if (ch === "\\")
-            out += "\\(rs";
-        else
-            out += ch;
-    }
-    return out;
+	let out = "";
+	for (const ch of input) if (ch === "\\") out += "\\(rs";
+	else out += ch;
+	return out;
 };
 const renderCell = (cell, nullPrint, numericLocale, dataTypeID, boolDisplay) => renderCellValue(cell, nullPrint, numericLocale, dataTypeID, boolDisplay);
+//#endregion
+export { troffMsPrinter };

package/dist/psql/print/unaligned.js

@@ -1,99 +1,73 @@
 import { boolDisplayOf, renderCellValue } from "./units.js";
+//#region src/psql/print/unaligned.ts
 /**
- * Unaligned tabular printer.
- *
- * Mirrors print.c `print_unaligned_text` / `print_unaligned_vertical`.
- *
- * Field separator defaults to `|`, record separator defaults to `\n`,
- * both honor `opts.topt.fieldSep` / `recordSep`. NULL cells render
- * `opts.nullPrint` (which falls back to `topt.nullPrint`, default `''`).
- *
- * Expanded (`\x`) mode prints `colname|value` per line with a blank
- * record-sep gap between rows.
- *
- * The default footer `(N rows)` is only emitted when not in expanded
- * mode and `topt.defaultFooter` is true; same as upstream psql.
- */
-export const unalignedPrinter = {
-    format: "unaligned",
-    printQuery(rs, opts, out) {
-        const topt = opts.topt;
-        const fieldSep = topt.fieldSep !== "" ? topt.fieldSep : "|";
-        const recordSep = topt.recordSep !== "" ? topt.recordSep : "\n";
-        const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
-        const expanded = topt.expanded === "on";
-        const tuplesOnly = topt.tuplesOnly;
-        const headers = rs.fields.map((f) => f.name);
-        const boolDisplay = boolDisplayOf(topt);
-        const cells = rs.rows.map((row) => row.map((cell, i) => renderCell(cell, nullPrint, topt.numericLocale, rs.fields[i]?.dataTypeID, boolDisplay)));
-        let outBuf = "";
-        if (expanded) {
-            // Vertical mode mirrors print.c `print_unaligned_vertical`: each
-            // record gap is a DOUBLE recordSep, the title (if any) emits
-            // without a trailing separator (the loop handles that), inter-
-            // column lines get one recordSep, and the closing footer block is
-            // preceded by a recordSep with one more recordSep separating each
-            // footer entry.
-            let needRecordSep = false;
-            if (!tuplesOnly && opts.title) {
-                outBuf += opts.title;
-                needRecordSep = true;
-            }
-            cells.forEach((row) => {
-                if (needRecordSep) {
-                    outBuf += recordSep + recordSep;
-                    needRecordSep = false;
-                }
-                row.forEach((value, colIdx) => {
-                    outBuf += headers[colIdx] + fieldSep + value;
-                    if (colIdx < row.length - 1) {
-                        outBuf += recordSep;
-                    }
-                    else {
-                        needRecordSep = true;
-                    }
-                });
-            });
-            if (!tuplesOnly && opts.footers && opts.footers.length > 0) {
-                outBuf += recordSep;
-                for (const footer of opts.footers) {
-                    outBuf += recordSep + footer;
-                }
-                needRecordSep = true;
-            }
-            if (needRecordSep)
-                outBuf += recordSep;
-        }
-        else {
-            // Horizontal mode.
-            if (!tuplesOnly && opts.title) {
-                outBuf += opts.title + recordSep;
-            }
-            if (!tuplesOnly) {
-                outBuf += headers.join(fieldSep) + recordSep;
-            }
-            cells.forEach((row) => {
-                outBuf += row.join(fieldSep) + recordSep;
-            });
-            // Default `(N rows)` footer is suppressed when the caller supplied its
-            // own footers — upstream (and aligned.ts) print user footers INSTEAD of
-            // the row count, not in addition (review: unaligned footer duplication).
-            const hasUserFooters = opts.footers !== undefined &&
-                opts.footers !== null &&
-                opts.footers.length > 0;
-            if (!tuplesOnly && topt.defaultFooter && !hasUserFooters) {
-                const n = rs.rows.length;
-                outBuf +=
-                    `(${String(n)} ${n === 1 ? "row" : "rows"})` + recordSep;
-            }
-            if (!tuplesOnly && hasUserFooters) {
-                for (const footer of opts.footers ?? []) {
-                    outBuf += footer + recordSep;
-                }
-            }
-        }
-        out.write(outBuf);
-        return Promise.resolve();
-    },
+* Unaligned tabular printer.
+*
+* Mirrors print.c `print_unaligned_text` / `print_unaligned_vertical`.
+*
+* Field separator defaults to `|`, record separator defaults to `\n`,
+* both honor `opts.topt.fieldSep` / `recordSep`. NULL cells render
+* `opts.nullPrint` (which falls back to `topt.nullPrint`, default `''`).
+*
+* Expanded (`\x`) mode prints `colname|value` per line with a blank
+* record-sep gap between rows.
+*
+* The default footer `(N rows)` is only emitted when not in expanded
+* mode and `topt.defaultFooter` is true; same as upstream psql.
+*/
+const unalignedPrinter = {
+	format: "unaligned",
+	printQuery(rs, opts, out) {
+		const topt = opts.topt;
+		const fieldSep = topt.fieldSep !== "" ? topt.fieldSep : "|";
+		const recordSep = topt.recordSep !== "" ? topt.recordSep : "\n";
+		const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
+		const expanded = topt.expanded === "on";
+		const tuplesOnly = topt.tuplesOnly;
+		const headers = rs.fields.map((f) => f.name);
+		const boolDisplay = boolDisplayOf(topt);
+		const cells = rs.rows.map((row) => row.map((cell, i) => renderCell(cell, nullPrint, topt.numericLocale, rs.fields[i]?.dataTypeID, boolDisplay)));
+		let outBuf = "";
+		if (expanded) {
+			let needRecordSep = false;
+			if (!tuplesOnly && opts.title) {
+				outBuf += opts.title;
+				needRecordSep = true;
+			}
+			cells.forEach((row) => {
+				if (needRecordSep) {
+					outBuf += recordSep + recordSep;
+					needRecordSep = false;
+				}
+				row.forEach((value, colIdx) => {
+					outBuf += headers[colIdx] + fieldSep + value;
+					if (colIdx < row.length - 1) outBuf += recordSep;
+					else needRecordSep = true;
+				});
+			});
+			if (!tuplesOnly && opts.footers && opts.footers.length > 0) {
+				outBuf += recordSep;
+				for (const footer of opts.footers) outBuf += recordSep + footer;
+				needRecordSep = true;
+			}
+			if (needRecordSep) outBuf += recordSep;
+		} else {
+			if (!tuplesOnly && opts.title) outBuf += opts.title + recordSep;
+			if (!tuplesOnly) outBuf += headers.join(fieldSep) + recordSep;
+			cells.forEach((row) => {
+				outBuf += row.join(fieldSep) + recordSep;
+			});
+			const hasUserFooters = opts.footers !== void 0 && opts.footers !== null && opts.footers.length > 0;
+			if (!tuplesOnly && topt.defaultFooter && !hasUserFooters) {
+				const n = rs.rows.length;
+				outBuf += `(${String(n)} ${n === 1 ? "row" : "rows"})` + recordSep;
+			}
+			if (!tuplesOnly && hasUserFooters) for (const footer of opts.footers ?? []) outBuf += footer + recordSep;
+		}
+		out.write(outBuf);
+		return Promise.resolve();
+	}
 };
 const renderCell = (cell, nullPrint, numericLocale, dataTypeID, boolDisplay) => renderCellValue(cell, nullPrint, numericLocale, dataTypeID, boolDisplay);
+//#endregion
+export { unalignedPrinter };