neon 3.0.0 → 3.1.1

package/dist/psql/print/csv.js

@@ -1,76 +1,54 @@
 import { boolDisplayOf, renderCellValue } from "./units.js";
+//#region src/psql/print/csv.ts
 /**
- * RFC 4180 CSV printer.
- *
- * Mirrors print.c `print_csv_text` / `print_csv_vertical`.
- *
- * - Field separator defaults to `,`; honors `topt.csvFieldSep`. The
- *   separator must be a single character and may not be `"`, `\n`, or
- *   `\r` (matches the psql `\pset csv_fieldsep` check).
- * - Line ending is always `\n` regardless of `topt.recordSep`, since
- *   `print_csv_text` writes `'\n'` literally.
- * - Header row is printed only when `startTable && !tuplesOnly`
- *   (matches `print_csv_text` — see the `start_table && !tuples_only`
- *   guard upstream). `\pset tuples_only true` suppresses the header.
- * - No footer in CSV.
- * - Expanded mode (`print_csv_vertical`) prints `name,value` lines and
- *   never emits a standalone header row.
- *
- * Quoting rule (from `csv_print_field`): wrap in double quotes if the
- * value contains the separator, a `"`, `\n`, or `\r`; inside quotes,
- * double the embedded `"`. We additionally quote `\.` (psql's COPY
- * sentinel) when the separator is `\` or `.`, matching upstream.
- */
-export const csvPrinter = {
-    format: "csv",
-    printQuery(rs, opts, out) {
-        const topt = opts.topt;
-        const sep = topt.csvFieldSep !== undefined && topt.csvFieldSep !== ""
-            ? topt.csvFieldSep
-            : ",";
-        if (sep.length !== 1 || sep === '"' || sep === "\n" || sep === "\r") {
-            throw new RangeError(`csv_fieldsep must be a single character other than '"', '\\n', or '\\r' (got ${JSON.stringify(sep)})`);
-        }
-        const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
-        const expanded = topt.expanded === "on";
-        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) {
-            for (const row of cells) {
-                row.forEach((value, colIdx) => {
-                    outBuf +=
-                        csvField(headers[colIdx], sep) +
-                            sep +
-                            csvField(value, sep) +
-                            "\n";
-                });
-            }
-        }
-        else {
-            // Header is gated on startTable && !tuplesOnly (cf. print.c).
-            if (topt.startTable && !topt.tuplesOnly) {
-                outBuf += headers.map((h) => csvField(h, sep)).join(sep) + "\n";
-            }
-            for (const row of cells) {
-                outBuf += row.map((c) => csvField(c, sep)).join(sep) + "\n";
-            }
-        }
-        out.write(outBuf);
-        return Promise.resolve();
-    },
+* RFC 4180 CSV printer.
+*
+* Mirrors print.c `print_csv_text` / `print_csv_vertical`.
+*
+* - Field separator defaults to `,`; honors `topt.csvFieldSep`. The
+*   separator must be a single character and may not be `"`, `\n`, or
+*   `\r` (matches the psql `\pset csv_fieldsep` check).
+* - Line ending is always `\n` regardless of `topt.recordSep`, since
+*   `print_csv_text` writes `'\n'` literally.
+* - Header row is printed only when `startTable && !tuplesOnly`
+*   (matches `print_csv_text` — see the `start_table && !tuples_only`
+*   guard upstream). `\pset tuples_only true` suppresses the header.
+* - No footer in CSV.
+* - Expanded mode (`print_csv_vertical`) prints `name,value` lines and
+*   never emits a standalone header row.
+*
+* Quoting rule (from `csv_print_field`): wrap in double quotes if the
+* value contains the separator, a `"`, `\n`, or `\r`; inside quotes,
+* double the embedded `"`. We additionally quote `\.` (psql's COPY
+* sentinel) when the separator is `\` or `.`, matching upstream.
+*/
+const csvPrinter = {
+	format: "csv",
+	printQuery(rs, opts, out) {
+		const topt = opts.topt;
+		const sep = topt.csvFieldSep !== void 0 && topt.csvFieldSep !== "" ? topt.csvFieldSep : ",";
+		if (sep.length !== 1 || sep === "\"" || sep === "\n" || sep === "\r") throw new RangeError(`csv_fieldsep must be a single character other than '"', '\\n', or '\\r' (got ${JSON.stringify(sep)})`);
+		const nullPrint = opts.nullPrint !== "" ? opts.nullPrint : topt.nullPrint;
+		const expanded = topt.expanded === "on";
+		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) for (const row of cells) row.forEach((value, colIdx) => {
+			outBuf += csvField(headers[colIdx], sep) + sep + csvField(value, sep) + "\n";
+		});
+		else {
+			if (topt.startTable && !topt.tuplesOnly) outBuf += headers.map((h) => csvField(h, sep)).join(sep) + "\n";
+			for (const row of cells) outBuf += row.map((c) => csvField(c, sep)).join(sep) + "\n";
+		}
+		out.write(outBuf);
+		return Promise.resolve();
+	}
 };
 const renderCell = (cell, nullPrint, numericLocale, dataTypeID, boolDisplay) => renderCellValue(cell, nullPrint, numericLocale, dataTypeID, boolDisplay);
 const csvField = (value, sep) => {
-    const needsQuote = value.includes(sep) ||
-        value.includes('"') ||
-        value.includes("\n") ||
-        value.includes("\r") ||
-        value === "\\." ||
-        sep === "\\" ||
-        sep === ".";
-    if (!needsQuote)
-        return value;
-    return `"${value.replace(/"/g, '""')}"`;
+	if (!(value.includes(sep) || value.includes("\"") || value.includes("\n") || value.includes("\r") || value === "\\." || sep === "\\" || sep === ".")) return value;
+	return `"${value.replace(/"/g, "\"\"")}"`;
 };
+//#endregion
+export { csvPrinter };

package/dist/psql/print/html.js

@@ -1,240 +1,209 @@
 import { boolDisplayOf, renderCellValue } from "./units.js";
+//#region src/psql/print/html.ts
 /**
- * HTML printer.
- *
- * Mirrors print.c `print_html_text` and `print_html_vertical`.
- *
- * Output shape (flat):
- *   <table border="1">
- *     <caption>title</caption>
- *     <tr>
- *       <th align="center">col</th>
- *       ...
- *     </tr>
- *     <tr valign="top">
- *       <td align="left">val</td>
- *       ...
- *     </tr>
- *     ...
- *   </table>
- *   <p>(N rows)<br />
- *   footer<br />
- *   </p>
- *
- * Output shape (expanded, `\pset expanded on`):
- *   <table border="1">
- *     <caption>title</caption>
- *
- *     <tr><td colspan="2" align="center">Record 1</td></tr>
- *     <tr valign="top">
- *       <th>col</th>
- *       <td align="left">val</td>
- *     </tr>
- *     ...
- *   </table>
- *   <p>user footer<br />
- *   </p>
- *
- * - `topt.tableAttr` is appended to the opening `<table>` tag.
- * - `topt.border` becomes the `border="..."` value.
- * - `topt.startTable` / `stopTable` gate the prologue/epilogue, allowing
- *   chunked streaming. For this WP both default to true, so the full
- *   document is emitted in one call.
- * - Right-align numeric columns based on the PG type-OID heuristic
- *   (`NUMERIC_OIDS`), matching how `print_aligned_text` derives the
- *   `aligns` array upstream.
- * - Cells that are whitespace-only render `&nbsp; ` so the cell still
- *   takes layout space (verbatim upstream behavior).
- * - Expanded mode renders a `<tr><td colspan="2" align="center">Record
- *   N</td></tr>` separator before each row (or `&nbsp;` placeholder
- *   when `tuplesOnly`); it never emits the 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 htmlPrinter = {
-    format: "html",
-    printQuery(rs, opts, out) {
-        const topt = opts.topt;
-        if (topt.expanded === "on") {
-            return printExpanded(rs, opts, out);
-        }
-        return printFlat(rs, opts, out);
-    },
+* HTML printer.
+*
+* Mirrors print.c `print_html_text` and `print_html_vertical`.
+*
+* Output shape (flat):
+*   <table border="1">
+*     <caption>title</caption>
+*     <tr>
+*       <th align="center">col</th>
+*       ...
+*     </tr>
+*     <tr valign="top">
+*       <td align="left">val</td>
+*       ...
+*     </tr>
+*     ...
+*   </table>
+*   <p>(N rows)<br />
+*   footer<br />
+*   </p>
+*
+* Output shape (expanded, `\pset expanded on`):
+*   <table border="1">
+*     <caption>title</caption>
+*
+*     <tr><td colspan="2" align="center">Record 1</td></tr>
+*     <tr valign="top">
+*       <th>col</th>
+*       <td align="left">val</td>
+*     </tr>
+*     ...
+*   </table>
+*   <p>user footer<br />
+*   </p>
+*
+* - `topt.tableAttr` is appended to the opening `<table>` tag.
+* - `topt.border` becomes the `border="..."` value.
+* - `topt.startTable` / `stopTable` gate the prologue/epilogue, allowing
+*   chunked streaming. For this WP both default to true, so the full
+*   document is emitted in one call.
+* - Right-align numeric columns based on the PG type-OID heuristic
+*   (`NUMERIC_OIDS`), matching how `print_aligned_text` derives the
+*   `aligns` array upstream.
+* - Cells that are whitespace-only render `&nbsp; ` so the cell still
+*   takes layout space (verbatim upstream behavior).
+* - Expanded mode renders a `<tr><td colspan="2" align="center">Record
+*   N</td></tr>` separator before each row (or `&nbsp;` placeholder
+*   when `tuplesOnly`); it never emits the default `(N rows)` footer.
+*/
+const NUMERIC_OIDS = /* @__PURE__ */ new Set([
+	21,
+	23,
+	20,
+	700,
+	701,
+	1700,
+	1186
+]);
+const htmlPrinter = {
+	format: "html",
+	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 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 aligns = rs.fields.map((f) => NUMERIC_OIDS.has(f.dataTypeID) ? "right" : "left");
-    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) {
-        buf += `<table border="${String(topt.border)}"`;
-        if (topt.tableAttr)
-            buf += ` ${topt.tableAttr}`;
-        buf += ">\n";
-        if (!tuplesOnly && title) {
-            buf += "  <caption>" + escapeHtml(title) + "</caption>\n";
-        }
-        if (!tuplesOnly) {
-            buf += "  <tr>\n";
-            for (const h of headers) {
-                buf += '    <th align="center">' + escapeHtml(h) + "</th>\n";
-            }
-            buf += "  </tr>\n";
-        }
-    }
-    for (const row of cells) {
-        buf += '  <tr valign="top">\n';
-        row.forEach((value, idx) => {
-            buf += `    <td align="${aligns[idx]}">`;
-            if (isWhitespaceOnly(value)) {
-                buf += "&nbsp; ";
-            }
-            else {
-                buf += escapeHtml(value);
-            }
-            buf += "</td>\n";
-        });
-        buf += "  </tr>\n";
-    }
-    if (stopTable) {
-        buf += "</table>\n";
-        if (!tuplesOnly) {
-            const effective = effectiveFooters(rs, topt, footers);
-            if (effective.length > 0) {
-                buf += "<p>";
-                for (const f of effective) {
-                    buf += escapeHtml(f) + "<br />\n";
-                }
-                buf += "</p>";
-            }
-        }
-        // Upstream `print_html_text` finishes with an unconditional
-        // `fputc('\n', fout)` AFTER the (optional) `<p>...</p>` block. The
-        // trailing newline appears regardless of footers / tuplesOnly.
-        buf += "\n";
-    }
-    out.write(buf);
-    return Promise.resolve();
+	const topt = opts.topt;
+	const tuplesOnly = topt.tuplesOnly;
+	const startTable = topt.startTable;
+	const stopTable = topt.stopTable;
+	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 aligns = rs.fields.map((f) => NUMERIC_OIDS.has(f.dataTypeID) ? "right" : "left");
+	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) {
+		buf += `<table border="${String(topt.border)}"`;
+		if (topt.tableAttr) buf += ` ${topt.tableAttr}`;
+		buf += ">\n";
+		if (!tuplesOnly && title) buf += "  <caption>" + escapeHtml(title) + "</caption>\n";
+		if (!tuplesOnly) {
+			buf += "  <tr>\n";
+			for (const h of headers) buf += "    <th align=\"center\">" + escapeHtml(h) + "</th>\n";
+			buf += "  </tr>\n";
+		}
+	}
+	for (const row of cells) {
+		buf += "  <tr valign=\"top\">\n";
+		row.forEach((value, idx) => {
+			buf += `    <td align="${aligns[idx]}">`;
+			if (isWhitespaceOnly(value)) buf += "&nbsp; ";
+			else buf += escapeHtml(value);
+			buf += "</td>\n";
+		});
+		buf += "  </tr>\n";
+	}
+	if (stopTable) {
+		buf += "</table>\n";
+		if (!tuplesOnly) {
+			const effective = effectiveFooters(rs, topt, footers);
+			if (effective.length > 0) {
+				buf += "<p>";
+				for (const f of effective) buf += escapeHtml(f) + "<br />\n";
+				buf += "</p>";
+			}
+		}
+		buf += "\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 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 aligns = rs.fields.map((f) => NUMERIC_OIDS.has(f.dataTypeID) ? "right" : "left");
-    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) {
-        buf += `<table border="${String(topt.border)}"`;
-        if (topt.tableAttr)
-            buf += ` ${topt.tableAttr}`;
-        buf += ">\n";
-        if (!tuplesOnly && title) {
-            buf += "  <caption>" + escapeHtml(title) + "</caption>\n";
-        }
-    }
-    let record = topt.prior + 1;
-    cells.forEach((row) => {
-        if (!tuplesOnly) {
-            buf += `\n  <tr><td colspan="2" align="center">Record ${String(record)}</td></tr>\n`;
-            record += 1;
-        }
-        else {
-            buf += '\n  <tr><td colspan="2">&nbsp;</td></tr>\n';
-        }
-        row.forEach((value, idx) => {
-            buf += '  <tr valign="top">\n';
-            buf += "    <th>" + escapeHtml(headers[idx]) + "</th>\n";
-            buf += `    <td align="${aligns[idx]}">`;
-            if (isWhitespaceOnly(value)) {
-                buf += "&nbsp; ";
-            }
-            else {
-                buf += escapeHtml(value);
-            }
-            buf += "</td>\n";
-            buf += "  </tr>\n";
-        });
-    });
-    if (stopTable) {
-        buf += "</table>\n";
-        // Expanded mode never emits the default "(N rows)" footer; only
-        // user-supplied footers appear (matches print_html_vertical).
-        if (!tuplesOnly && footers && footers.length > 0) {
-            buf += "<p>";
-            for (const f of footers) {
-                buf += escapeHtml(f) + "<br />\n";
-            }
-            buf += "</p>";
-        }
-        buf += "\n";
-    }
-    out.write(buf);
-    return Promise.resolve();
+	const topt = opts.topt;
+	const tuplesOnly = topt.tuplesOnly;
+	const startTable = topt.startTable;
+	const stopTable = topt.stopTable;
+	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 aligns = rs.fields.map((f) => NUMERIC_OIDS.has(f.dataTypeID) ? "right" : "left");
+	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) {
+		buf += `<table border="${String(topt.border)}"`;
+		if (topt.tableAttr) buf += ` ${topt.tableAttr}`;
+		buf += ">\n";
+		if (!tuplesOnly && title) buf += "  <caption>" + escapeHtml(title) + "</caption>\n";
+	}
+	let record = topt.prior + 1;
+	cells.forEach((row) => {
+		if (!tuplesOnly) {
+			buf += `\n  <tr><td colspan="2" align="center">Record ${String(record)}</td></tr>\n`;
+			record += 1;
+		} else buf += "\n  <tr><td colspan=\"2\">&nbsp;</td></tr>\n";
+		row.forEach((value, idx) => {
+			buf += "  <tr valign=\"top\">\n";
+			buf += "    <th>" + escapeHtml(headers[idx]) + "</th>\n";
+			buf += `    <td align="${aligns[idx]}">`;
+			if (isWhitespaceOnly(value)) buf += "&nbsp; ";
+			else buf += escapeHtml(value);
+			buf += "</td>\n";
+			buf += "  </tr>\n";
+		});
+	});
+	if (stopTable) {
+		buf += "</table>\n";
+		if (!tuplesOnly && footers && footers.length > 0) {
+			buf += "<p>";
+			for (const f of footers) buf += escapeHtml(f) + "<br />\n";
+			buf += "</p>";
+		}
+		buf += "\n";
+	}
+	out.write(buf);
+	return Promise.resolve();
 };
 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 isWhitespaceOnly = (s) => {
-    if (s.length === 0)
-        return true;
-    for (const ch of s) {
-        if (ch !== " " && ch !== "\t")
-            return false;
-    }
-    return true;
+	if (s.length === 0) return true;
+	for (const ch of s) if (ch !== " " && ch !== "	") return false;
+	return true;
 };
 const escapeHtml = (input) => {
-    // Upstream `html_escaped_print` walks the string byte-by-byte and
-    // converts leading spaces (per line) to `&nbsp;` so EXPLAIN output
-    // stays indented. We replicate that with a stateful pass.
-    let out = "";
-    let leadingSpace = true;
-    for (const ch of input) {
-        switch (ch) {
-            case "&":
-                out += "&amp;";
-                break;
-            case "<":
-                out += "&lt;";
-                break;
-            case ">":
-                out += "&gt;";
-                break;
-            case '"':
-                out += "&quot;";
-                break;
-            case "\n":
-                out += "<br />\n";
-                break;
-            case " ":
-                out += leadingSpace ? "&nbsp;" : " ";
-                break;
-            default:
-                out += ch;
-        }
-        if (ch !== " ")
-            leadingSpace = false;
-    }
-    return out;
+	let out = "";
+	let leadingSpace = true;
+	for (const ch of input) {
+		switch (ch) {
+			case "&":
+				out += "&amp;";
+				break;
+			case "<":
+				out += "&lt;";
+				break;
+			case ">":
+				out += "&gt;";
+				break;
+			case "\"":
+				out += "&quot;";
+				break;
+			case "\n":
+				out += "<br />\n";
+				break;
+			case " ":
+				out += leadingSpace ? "&nbsp;" : " ";
+				break;
+			default: out += ch;
+		}
+		if (ch !== " ") leadingSpace = false;
+	}
+	return out;
 };
 const renderCell = (cell, nullPrint, numericLocale, dataTypeID, boolDisplay) => renderCellValue(cell, nullPrint, numericLocale, dataTypeID, boolDisplay);
+//#endregion
+export { htmlPrinter };