document-cli 1.2.11 → 1.3.0

package/dist/cli.js

@@ -2,7 +2,7 @@
 import { a as odbFormSummary, c as writeOutput, d as inferFormatFromExtension, f as isDocumentFormat, i as formatOdbReportLines, l as loadProvidedFonts, n as describeOdbReport, o as readInput, r as formatOdbFormLines, s as resolveDefaultOutputPath, t as describeOdbForm } from "./odb-structure-CX_0zL8_.js";
 import { Command, CommanderError, InvalidArgumentError } from "commander";
 import { writeFile } from "node:fs/promises";
-import { OdbNoEmbeddedDataSourceError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, UnrecognizedDocumentSchemaError, buildDocxPackage, buildMarkdownText, buildOdgPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, createLocalDocumentConverter, documentFromJson, documentPackageWithSchema, encodeMarkdownText, encodePackage, odbToCsv, odbToXlsx, odmToPdf, readOdbForms, readOdbReports, readOdbTables, readPdf, writePdf } from "documents.js";
+import { HsqldbSqlEvaluationError, HsqldbSqlParseError, HsqldbSqlUnsupportedError, OdbNoEmbeddedDataSourceError, OdbReportNotSpecifiedError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, UnrecognizedDocumentSchemaError, buildDocxPackage, buildMarkdownText, buildOdgPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, convertWordprocessingToLayout, createFontMeasurer, createFontRegistry, createLocalDocumentConverter, documentFromJson, documentPackageWithSchema, encodeMarkdownText, encodePackage, evaluateSelect, hsqldbCellDisplayText, odbToCsv, odbToXlsx, odmToPdf, parseSelect, readOdbForms, readOdbInventory, readOdbReportContent, readOdbReports, readOdbTables, readPdf, writePdf } from "documents.js";
 import { basename, dirname, extname, join } from "node:path";
 import { decodePackage, encodePackage as encodePackage$1 } from "odf.js";
 import { existsSync, readFileSync } from "node:fs";
@@ -114,7 +114,8 @@ function pdfDiagnosticToDiagnostic(diagnostic) {
 function mapErrorToExit(error, abortReason) {
 	if (abortReason === "interrupt") return 130;
 	if (abortReason === "timeout") return 124;
-	if (error instanceof OdmUnresolvedSectionError || error instanceof OdbTableNotSpecifiedError || error instanceof OdbTableNotFoundError || error instanceof OdbNoEmbeddedDataSourceError || error instanceof OdbUnsupportedFormatError) return 3;
+	if (error instanceof OdmUnresolvedSectionError || error instanceof OdbTableNotSpecifiedError || error instanceof OdbTableNotFoundError || error instanceof OdbNoEmbeddedDataSourceError || error instanceof OdbUnsupportedFormatError || error instanceof OdbReportNotSpecifiedError) return 3;
+	if (error instanceof HsqldbSqlUnsupportedError || error instanceof HsqldbSqlParseError || error instanceof HsqldbSqlEvaluationError) return 1;
 	if (error instanceof PdfEncryptedError || error instanceof PdfParseError) return 1;
 	return 1;
 }
@@ -373,6 +374,27 @@ function registerFromPackageCommand(program) {
 	});
 }
 //#endregion
+//#region src/sql-result-format.ts
+const COLUMN_GAP = "  ";
+function columnWidths(columns, cells) {
+	return columns.map((column, index) => {
+		const cellWidths = cells.map((row) => row[index]?.length ?? 0);
+		return Math.max(column.length, ...cellWidths);
+	});
+}
+function formatRow(values, widths) {
+	return values.map((value, index) => value.padEnd(widths[index] ?? value.length)).join(COLUMN_GAP).trimEnd();
+}
+function formatSqlResultSetTable(result) {
+	const { columns, rows } = result;
+	const cells = rows.map((row) => row.map((value) => hsqldbCellDisplayText(value)));
+	const widths = columnWidths(columns, cells);
+	const lines = [formatRow(columns, widths), formatRow(widths.map((width) => "-".repeat(width)), widths)];
+	for (const row of cells) lines.push(formatRow(row, widths));
+	lines.push(`${rows.length} row${rows.length === 1 ? "" : "s"}`);
+	return lines;
+}
+//#endregion
 //#region src/commands/odb.ts
 function reportOdbError(command, error, verbose, abortReason) {
 	if (error instanceof OdbNoEmbeddedDataSourceError || error instanceof OdbUnsupportedFormatError) {
@@ -389,6 +411,13 @@ function reportOdbCsvError(command, error, verbose, abortReason) {
 	}
 	return reportOdbError(command, error, verbose, abortReason);
 }
+function reportOdbReportError(command, error, verbose, abortReason) {
+	if (error instanceof OdbReportNotSpecifiedError) {
+		process.stderr.write(`[${command}] ${error.message}\nrun 'odb-reports' first to see the available reports\n`);
+		return mapErrorToExit(error, abortReason);
+	}
+	return reportOdbError(command, error, verbose, abortReason);
+}
 function resolveDefaultCsvOutputPath(inputPath) {
 	const directory = dirname(inputPath);
 	const stem = basename(inputPath, extname(inputPath));
@@ -474,6 +503,48 @@ async function runOdbTables(input, options) {
 		return reportOdbError(command, error, false, getAbortReason());
 	}
 }
+function resolveQuerySql(pkg, options) {
+	if (options.sql !== void 0) return { sql: options.sql };
+	const queryName = options.query;
+	if (queryName === void 0) return { errorMessage: "pass --sql <text> or --query <savedName>" };
+	const inventory = readOdbInventory(pkg);
+	const saved = inventory.queries.find((candidate) => candidate.name === queryName);
+	if (saved === void 0) {
+		const available = inventory.queries.map((candidate) => candidate.name);
+		return { errorMessage: `this .odb declares no saved query named '${queryName}'${available.length === 0 ? "" : ` -- available: ${available.join(", ")}`}` };
+	}
+	return { sql: saved.command };
+}
+async function runOdbQuery(input, options) {
+	const command = "odb-query";
+	if (options.sql !== void 0 && options.query !== void 0) {
+		process.stderr.write(`[${command}] pass --sql or --query, not both\n`);
+		return 2;
+	}
+	if (options.sql === void 0 && options.query === void 0) {
+		process.stderr.write(`[${command}] pass --sql <text> or --query <savedName>\n`);
+		return 2;
+	}
+	const { signal, getAbortReason } = createRuntimeSignal({});
+	try {
+		const inputBytes = await readInput(input, { signal });
+		const pkg = decodePackage(new Uint8Array(inputBytes));
+		const resolved = resolveQuerySql(pkg, options);
+		if ("errorMessage" in resolved) {
+			process.stderr.write(`[${command}] ${resolved.errorMessage}\n`);
+			return 2;
+		}
+		const result = evaluateSelect(parseSelect(resolved.sql), readOdbTables(pkg));
+		if (options.json) {
+			process.stdout.write(`${JSON.stringify(result)}\n`);
+			return 0;
+		}
+		for (const line of formatSqlResultSetTable(result)) process.stdout.write(`${line}\n`);
+		return 0;
+	} catch (error) {
+		return reportOdbError(command, error, false, getAbortReason());
+	}
+}
 async function runOdbForms(input, options) {
 	const command = "odb-forms";
 	const { signal, getAbortReason } = createRuntimeSignal({});
@@ -520,6 +591,93 @@ async function runOdbReports(input, options) {
 		return reportOdbError(command, error, false, getAbortReason());
 	}
 }
+const ODB_REPORT_TARGET_FORMATS = {
+	docx: true,
+	odt: true,
+	pdf: true
+};
+function isOdbReportTargetFormat(format) {
+	return format in ODB_REPORT_TARGET_FORMATS;
+}
+function renderOdbReportBytes(content, target, options) {
+	if (target === "docx") return encodePackage(buildDocxPackage(content));
+	if (target === "odt") return encodePackage$1(buildOdtPackage(content));
+	if (content.kind !== "wordprocessing") throw new Error("readOdbReportContent returned a non-wordprocessing ContentDocument");
+	const fonts = createFontRegistry({
+		fonts: options.fonts,
+		onSubstitution: (substitution) => {
+			if (options.reportFontSubstitution !== void 0) {
+				options.reportFontSubstitution(substitution);
+				return;
+			}
+			options.onDiagnosticCounted();
+			options.reporter.report(fontSubstitutionToDiagnostic(substitution));
+		}
+	});
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(fonts) });
+	return writePdf(layout, {
+		signal: options.signal,
+		onSubstitution: (substitution, context) => {
+			options.onDiagnosticCounted();
+			options.reporter.report(substitutionToDiagnostic(substitution, context.pageIndex));
+		},
+		formulas,
+		fonts
+	});
+}
+async function runOdbRenderReport(input, output, options) {
+	const command = "odb-render-report";
+	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
+		process.stderr.write(`[${command}] conflicting output destinations: positional '${output}' and --out '${options.out}'\n`);
+		return 2;
+	}
+	const target = resolveTargetFormat(output, options.out, options.to);
+	if ("errorMessage" in target) {
+		process.stderr.write(`[${command}] ${target.errorMessage}\n`);
+		return 2;
+	}
+	if (!isOdbReportTargetFormat(target.format)) {
+		process.stderr.write(`[${command}] '${target.format}' is not a supported report render target; expected one of docx, odt, pdf\n`);
+		return 2;
+	}
+	const targetFormat = target.format;
+	const resolvedOutput = output ?? options.out ?? (input === "-" ? "-" : resolveDefaultOutputPath(input, targetFormat));
+	const { signal, getAbortReason } = createRuntimeSignal({ timeoutMs: options.timeout });
+	const reporter = createDiagnosticReporter({
+		json: options.json,
+		quiet: options.quiet,
+		command
+	});
+	let diagnosticCount = 0;
+	const reportFontSubstitution = options.reportFontSubstitutions === true ? createFontSubstitutionReporter({
+		json: options.json,
+		quiet: options.quiet,
+		command
+	}) : void 0;
+	try {
+		const inputBytes = await readInput(input, { signal });
+		const fonts = await loadProvidedFonts(options.fontFile ?? [], { signal });
+		const pkg = decodePackage(new Uint8Array(inputBytes));
+		const bytes = renderOdbReportBytes(readOdbReportContent(pkg, { report: options.report }), targetFormat, {
+			fonts,
+			signal,
+			reporter,
+			reportFontSubstitution,
+			onDiagnosticCounted: () => {
+				diagnosticCount += 1;
+			}
+		});
+		await writeOutput(resolvedOutput, bytes);
+		reporter.summarize({
+			output: resolvedOutput,
+			bytes: bytes.byteLength,
+			diagnosticCount
+		});
+		return 0;
+	} catch (error) {
+		return reportOdbReportError(command, error, options.verbose, getAbortReason());
+	}
+}
 function registerOdbToXlsxCommand(program) {
 	const command = program.command("odb-to-xlsx <input> [output]").description("extract every table an embedded .odb database declares into one xlsx workbook, one sheet per table");
 	addOutOption(command);
@@ -558,12 +716,33 @@ function registerOdbReportsCommand(program) {
 		process.exitCode = await runOdbReports(input, options);
 	});
 }
+function registerOdbQueryCommand(program) {
+	program.command("odb-query <input>").description("run a bounded SELECT over an embedded .odb database's own extracted tables, given directly or by naming one of its saved queries").option("--sql <text>", "the SELECT statement to run -- mutually exclusive with --query").option("--query <savedName>", "the name of one of the .odb's own saved queries to run -- mutually exclusive with --sql").option("--json", "emit the result set as JSON ({ columns, rows }) instead of a plain-text table", false).action(async (input, options) => {
+		process.exitCode = await runOdbQuery(input, options);
+	});
+}
+function registerOdbRenderReportCommand(program) {
+	const command = program.command("odb-render-report <input> [output]").description("render one of an .odb's own reports -- its query resolved, its rpt: formulas evaluated, its bands laid out -- to docx, odt, or pdf");
+	addOutOption(command);
+	addTimeoutOption(command);
+	addJsonOption(command);
+	addQuietOption(command);
+	addVerboseOption(command);
+	addFontOptions(command);
+	command.option("--report <name>", "the report to render -- required only when the .odb declares more than one report");
+	command.option("--to <format>", "target format when it cannot be inferred from the output path (docx, odt, pdf)");
+	command.action(async (input, output, options) => {
+		process.exitCode = await runOdbRenderReport(input, output, options);
+	});
+}
 function registerOdbCommands(program) {
 	registerOdbToXlsxCommand(program);
 	registerOdbToCsvCommand(program);
 	registerOdbTablesCommand(program);
 	registerOdbFormsCommand(program);
 	registerOdbReportsCommand(program);
+	registerOdbQueryCommand(program);
+	registerOdbRenderReportCommand(program);
 }
 //#endregion
 //#region src/commands/odm.ts
@@ -744,7 +923,7 @@ function registerPdfInspectCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.11";
+var version = "1.3.0";
 //#endregion
 //#region src/program.ts
 function createProgram() {
@@ -767,7 +946,7 @@ function createProgram() {
 //#region src/cli.ts
 async function launchTui(startPath, signal) {
 	try {
-		const { runTui } = await import("./tui-DD4bQp39.js");
+		const { runTui } = await import("./tui-C8ITn1zQ.js");
 		await runTui({
 			startPath,
 			signal

package/dist/index.cjs

@@ -162,7 +162,8 @@ const EXIT_INTERRUPTED = 130;
 function mapErrorToExit(error, abortReason) {
 	if (abortReason === "interrupt") return 130;
 	if (abortReason === "timeout") return 124;
-	if (error instanceof documents_js.OdmUnresolvedSectionError || error instanceof documents_js.OdbTableNotSpecifiedError || error instanceof documents_js.OdbTableNotFoundError || error instanceof documents_js.OdbNoEmbeddedDataSourceError || error instanceof documents_js.OdbUnsupportedFormatError) return 3;
+	if (error instanceof documents_js.OdmUnresolvedSectionError || error instanceof documents_js.OdbTableNotSpecifiedError || error instanceof documents_js.OdbTableNotFoundError || error instanceof documents_js.OdbNoEmbeddedDataSourceError || error instanceof documents_js.OdbUnsupportedFormatError || error instanceof documents_js.OdbReportNotSpecifiedError) return 3;
+	if (error instanceof documents_js.HsqldbSqlUnsupportedError || error instanceof documents_js.HsqldbSqlParseError || error instanceof documents_js.HsqldbSqlEvaluationError) return 1;
 	if (error instanceof documents_js.PdfEncryptedError || error instanceof documents_js.PdfParseError) return 1;
 	return 1;
 }
@@ -758,6 +759,27 @@ function formatOdbReportLines(report) {
 	return lines;
 }
 //#endregion
+//#region src/sql-result-format.ts
+const COLUMN_GAP = "  ";
+function columnWidths(columns, cells) {
+	return columns.map((column, index) => {
+		const cellWidths = cells.map((row) => row[index]?.length ?? 0);
+		return Math.max(column.length, ...cellWidths);
+	});
+}
+function formatRow(values, widths) {
+	return values.map((value, index) => value.padEnd(widths[index] ?? value.length)).join(COLUMN_GAP).trimEnd();
+}
+function formatSqlResultSetTable(result) {
+	const { columns, rows } = result;
+	const cells = rows.map((row) => row.map((value) => (0, documents_js.hsqldbCellDisplayText)(value)));
+	const widths = columnWidths(columns, cells);
+	const lines = [formatRow(columns, widths), formatRow(widths.map((width) => "-".repeat(width)), widths)];
+	for (const row of cells) lines.push(formatRow(row, widths));
+	lines.push(`${rows.length} row${rows.length === 1 ? "" : "s"}`);
+	return lines;
+}
+//#endregion
 //#region src/commands/odb.ts
 function reportOdbError(command, error, verbose, abortReason) {
 	if (error instanceof documents_js.OdbNoEmbeddedDataSourceError || error instanceof documents_js.OdbUnsupportedFormatError) {
@@ -774,6 +796,13 @@ function reportOdbCsvError(command, error, verbose, abortReason) {
 	}
 	return reportOdbError(command, error, verbose, abortReason);
 }
+function reportOdbReportError(command, error, verbose, abortReason) {
+	if (error instanceof documents_js.OdbReportNotSpecifiedError) {
+		process.stderr.write(`[${command}] ${error.message}\nrun 'odb-reports' first to see the available reports\n`);
+		return mapErrorToExit(error, abortReason);
+	}
+	return reportOdbError(command, error, verbose, abortReason);
+}
 function resolveDefaultCsvOutputPath(inputPath) {
 	const directory = (0, node_path.dirname)(inputPath);
 	const stem = (0, node_path.basename)(inputPath, (0, node_path.extname)(inputPath));
@@ -859,6 +888,48 @@ async function runOdbTables(input, options) {
 		return reportOdbError(command, error, false, getAbortReason());
 	}
 }
+function resolveQuerySql(pkg, options) {
+	if (options.sql !== void 0) return { sql: options.sql };
+	const queryName = options.query;
+	if (queryName === void 0) return { errorMessage: "pass --sql <text> or --query <savedName>" };
+	const inventory = (0, documents_js.readOdbInventory)(pkg);
+	const saved = inventory.queries.find((candidate) => candidate.name === queryName);
+	if (saved === void 0) {
+		const available = inventory.queries.map((candidate) => candidate.name);
+		return { errorMessage: `this .odb declares no saved query named '${queryName}'${available.length === 0 ? "" : ` -- available: ${available.join(", ")}`}` };
+	}
+	return { sql: saved.command };
+}
+async function runOdbQuery(input, options) {
+	const command = "odb-query";
+	if (options.sql !== void 0 && options.query !== void 0) {
+		process.stderr.write(`[${command}] pass --sql or --query, not both\n`);
+		return 2;
+	}
+	if (options.sql === void 0 && options.query === void 0) {
+		process.stderr.write(`[${command}] pass --sql <text> or --query <savedName>\n`);
+		return 2;
+	}
+	const { signal, getAbortReason } = createRuntimeSignal({});
+	try {
+		const inputBytes = await readInput(input, { signal });
+		const pkg = (0, odf_js.decodePackage)(new Uint8Array(inputBytes));
+		const resolved = resolveQuerySql(pkg, options);
+		if ("errorMessage" in resolved) {
+			process.stderr.write(`[${command}] ${resolved.errorMessage}\n`);
+			return 2;
+		}
+		const result = (0, documents_js.evaluateSelect)((0, documents_js.parseSelect)(resolved.sql), (0, documents_js.readOdbTables)(pkg));
+		if (options.json) {
+			process.stdout.write(`${JSON.stringify(result)}\n`);
+			return 0;
+		}
+		for (const line of formatSqlResultSetTable(result)) process.stdout.write(`${line}\n`);
+		return 0;
+	} catch (error) {
+		return reportOdbError(command, error, false, getAbortReason());
+	}
+}
 async function runOdbForms(input, options) {
 	const command = "odb-forms";
 	const { signal, getAbortReason } = createRuntimeSignal({});
@@ -905,6 +976,93 @@ async function runOdbReports(input, options) {
 		return reportOdbError(command, error, false, getAbortReason());
 	}
 }
+const ODB_REPORT_TARGET_FORMATS = {
+	docx: true,
+	odt: true,
+	pdf: true
+};
+function isOdbReportTargetFormat(format) {
+	return format in ODB_REPORT_TARGET_FORMATS;
+}
+function renderOdbReportBytes(content, target, options) {
+	if (target === "docx") return (0, documents_js.encodePackage)((0, documents_js.buildDocxPackage)(content));
+	if (target === "odt") return (0, odf_js.encodePackage)((0, documents_js.buildOdtPackage)(content));
+	if (content.kind !== "wordprocessing") throw new Error("readOdbReportContent returned a non-wordprocessing ContentDocument");
+	const fonts = (0, documents_js.createFontRegistry)({
+		fonts: options.fonts,
+		onSubstitution: (substitution) => {
+			if (options.reportFontSubstitution !== void 0) {
+				options.reportFontSubstitution(substitution);
+				return;
+			}
+			options.onDiagnosticCounted();
+			options.reporter.report(fontSubstitutionToDiagnostic(substitution));
+		}
+	});
+	const { document: layout, formulas } = (0, documents_js.convertWordprocessingToLayout)(content, { measurer: (0, documents_js.createFontMeasurer)(fonts) });
+	return (0, documents_js.writePdf)(layout, {
+		signal: options.signal,
+		onSubstitution: (substitution, context) => {
+			options.onDiagnosticCounted();
+			options.reporter.report(substitutionToDiagnostic(substitution, context.pageIndex));
+		},
+		formulas,
+		fonts
+	});
+}
+async function runOdbRenderReport(input, output, options) {
+	const command = "odb-render-report";
+	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
+		process.stderr.write(`[${command}] conflicting output destinations: positional '${output}' and --out '${options.out}'\n`);
+		return 2;
+	}
+	const target = resolveTargetFormat(output, options.out, options.to);
+	if ("errorMessage" in target) {
+		process.stderr.write(`[${command}] ${target.errorMessage}\n`);
+		return 2;
+	}
+	if (!isOdbReportTargetFormat(target.format)) {
+		process.stderr.write(`[${command}] '${target.format}' is not a supported report render target; expected one of docx, odt, pdf\n`);
+		return 2;
+	}
+	const targetFormat = target.format;
+	const resolvedOutput = output ?? options.out ?? (input === "-" ? "-" : resolveDefaultOutputPath(input, targetFormat));
+	const { signal, getAbortReason } = createRuntimeSignal({ timeoutMs: options.timeout });
+	const reporter = createDiagnosticReporter({
+		json: options.json,
+		quiet: options.quiet,
+		command
+	});
+	let diagnosticCount = 0;
+	const reportFontSubstitution = options.reportFontSubstitutions === true ? createFontSubstitutionReporter({
+		json: options.json,
+		quiet: options.quiet,
+		command
+	}) : void 0;
+	try {
+		const inputBytes = await readInput(input, { signal });
+		const fonts = await loadProvidedFonts(options.fontFile ?? [], { signal });
+		const pkg = (0, odf_js.decodePackage)(new Uint8Array(inputBytes));
+		const bytes = renderOdbReportBytes((0, documents_js.readOdbReportContent)(pkg, { report: options.report }), targetFormat, {
+			fonts,
+			signal,
+			reporter,
+			reportFontSubstitution,
+			onDiagnosticCounted: () => {
+				diagnosticCount += 1;
+			}
+		});
+		await writeOutput(resolvedOutput, bytes);
+		reporter.summarize({
+			output: resolvedOutput,
+			bytes: bytes.byteLength,
+			diagnosticCount
+		});
+		return 0;
+	} catch (error) {
+		return reportOdbReportError(command, error, options.verbose, getAbortReason());
+	}
+}
 function registerOdbToXlsxCommand(program) {
 	const command = program.command("odb-to-xlsx <input> [output]").description("extract every table an embedded .odb database declares into one xlsx workbook, one sheet per table");
 	addOutOption(command);
@@ -943,12 +1101,33 @@ function registerOdbReportsCommand(program) {
 		process.exitCode = await runOdbReports(input, options);
 	});
 }
+function registerOdbQueryCommand(program) {
+	program.command("odb-query <input>").description("run a bounded SELECT over an embedded .odb database's own extracted tables, given directly or by naming one of its saved queries").option("--sql <text>", "the SELECT statement to run -- mutually exclusive with --query").option("--query <savedName>", "the name of one of the .odb's own saved queries to run -- mutually exclusive with --sql").option("--json", "emit the result set as JSON ({ columns, rows }) instead of a plain-text table", false).action(async (input, options) => {
+		process.exitCode = await runOdbQuery(input, options);
+	});
+}
+function registerOdbRenderReportCommand(program) {
+	const command = program.command("odb-render-report <input> [output]").description("render one of an .odb's own reports -- its query resolved, its rpt: formulas evaluated, its bands laid out -- to docx, odt, or pdf");
+	addOutOption(command);
+	addTimeoutOption(command);
+	addJsonOption(command);
+	addQuietOption(command);
+	addVerboseOption(command);
+	addFontOptions(command);
+	command.option("--report <name>", "the report to render -- required only when the .odb declares more than one report");
+	command.option("--to <format>", "target format when it cannot be inferred from the output path (docx, odt, pdf)");
+	command.action(async (input, output, options) => {
+		process.exitCode = await runOdbRenderReport(input, output, options);
+	});
+}
 function registerOdbCommands(program) {
 	registerOdbToXlsxCommand(program);
 	registerOdbToCsvCommand(program);
 	registerOdbTablesCommand(program);
 	registerOdbFormsCommand(program);
 	registerOdbReportsCommand(program);
+	registerOdbQueryCommand(program);
+	registerOdbRenderReportCommand(program);
 }
 //#endregion
 //#region src/commands/odm.ts
@@ -1129,7 +1308,7 @@ function registerPdfInspectCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.11";
+var version = "1.3.0";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/index.js

@@ -1,5 +1,5 @@
 import { readFile, writeFile } from "node:fs/promises";
-import { OdbNoEmbeddedDataSourceError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, UnrecognizedDocumentSchemaError, buildDocxPackage, buildMarkdownText, buildOdgPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, createLocalDocumentConverter, documentFromJson, documentPackageWithSchema, encodeMarkdownText, encodePackage, odbToCsv, odbToXlsx, odmToPdf, readOdbForms, readOdbReports, readOdbTables, readPdf, writePdf } from "documents.js";
+import { HsqldbSqlEvaluationError, HsqldbSqlParseError, HsqldbSqlUnsupportedError, OdbNoEmbeddedDataSourceError, OdbReportNotSpecifiedError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, UnrecognizedDocumentSchemaError, buildDocxPackage, buildMarkdownText, buildOdgPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, convertWordprocessingToLayout, createFontMeasurer, createFontRegistry, createLocalDocumentConverter, documentFromJson, documentPackageWithSchema, encodeMarkdownText, encodePackage, evaluateSelect, hsqldbCellDisplayText, odbToCsv, odbToXlsx, odmToPdf, parseSelect, readOdbForms, readOdbInventory, readOdbReportContent, readOdbReports, readOdbTables, readPdf, writePdf } from "documents.js";
 import { basename, dirname, extname, join } from "node:path";
 import { Command, InvalidArgumentError } from "commander";
 import { decodePackage, encodePackage as encodePackage$1 } from "odf.js";
@@ -161,7 +161,8 @@ const EXIT_INTERRUPTED = 130;
 function mapErrorToExit(error, abortReason) {
 	if (abortReason === "interrupt") return 130;
 	if (abortReason === "timeout") return 124;
-	if (error instanceof OdmUnresolvedSectionError || error instanceof OdbTableNotSpecifiedError || error instanceof OdbTableNotFoundError || error instanceof OdbNoEmbeddedDataSourceError || error instanceof OdbUnsupportedFormatError) return 3;
+	if (error instanceof OdmUnresolvedSectionError || error instanceof OdbTableNotSpecifiedError || error instanceof OdbTableNotFoundError || error instanceof OdbNoEmbeddedDataSourceError || error instanceof OdbUnsupportedFormatError || error instanceof OdbReportNotSpecifiedError) return 3;
+	if (error instanceof HsqldbSqlUnsupportedError || error instanceof HsqldbSqlParseError || error instanceof HsqldbSqlEvaluationError) return 1;
 	if (error instanceof PdfEncryptedError || error instanceof PdfParseError) return 1;
 	return 1;
 }
@@ -757,6 +758,27 @@ function formatOdbReportLines(report) {
 	return lines;
 }
 //#endregion
+//#region src/sql-result-format.ts
+const COLUMN_GAP = "  ";
+function columnWidths(columns, cells) {
+	return columns.map((column, index) => {
+		const cellWidths = cells.map((row) => row[index]?.length ?? 0);
+		return Math.max(column.length, ...cellWidths);
+	});
+}
+function formatRow(values, widths) {
+	return values.map((value, index) => value.padEnd(widths[index] ?? value.length)).join(COLUMN_GAP).trimEnd();
+}
+function formatSqlResultSetTable(result) {
+	const { columns, rows } = result;
+	const cells = rows.map((row) => row.map((value) => hsqldbCellDisplayText(value)));
+	const widths = columnWidths(columns, cells);
+	const lines = [formatRow(columns, widths), formatRow(widths.map((width) => "-".repeat(width)), widths)];
+	for (const row of cells) lines.push(formatRow(row, widths));
+	lines.push(`${rows.length} row${rows.length === 1 ? "" : "s"}`);
+	return lines;
+}
+//#endregion
 //#region src/commands/odb.ts
 function reportOdbError(command, error, verbose, abortReason) {
 	if (error instanceof OdbNoEmbeddedDataSourceError || error instanceof OdbUnsupportedFormatError) {
@@ -773,6 +795,13 @@ function reportOdbCsvError(command, error, verbose, abortReason) {
 	}
 	return reportOdbError(command, error, verbose, abortReason);
 }
+function reportOdbReportError(command, error, verbose, abortReason) {
+	if (error instanceof OdbReportNotSpecifiedError) {
+		process.stderr.write(`[${command}] ${error.message}\nrun 'odb-reports' first to see the available reports\n`);
+		return mapErrorToExit(error, abortReason);
+	}
+	return reportOdbError(command, error, verbose, abortReason);
+}
 function resolveDefaultCsvOutputPath(inputPath) {
 	const directory = dirname(inputPath);
 	const stem = basename(inputPath, extname(inputPath));
@@ -858,6 +887,48 @@ async function runOdbTables(input, options) {
 		return reportOdbError(command, error, false, getAbortReason());
 	}
 }
+function resolveQuerySql(pkg, options) {
+	if (options.sql !== void 0) return { sql: options.sql };
+	const queryName = options.query;
+	if (queryName === void 0) return { errorMessage: "pass --sql <text> or --query <savedName>" };
+	const inventory = readOdbInventory(pkg);
+	const saved = inventory.queries.find((candidate) => candidate.name === queryName);
+	if (saved === void 0) {
+		const available = inventory.queries.map((candidate) => candidate.name);
+		return { errorMessage: `this .odb declares no saved query named '${queryName}'${available.length === 0 ? "" : ` -- available: ${available.join(", ")}`}` };
+	}
+	return { sql: saved.command };
+}
+async function runOdbQuery(input, options) {
+	const command = "odb-query";
+	if (options.sql !== void 0 && options.query !== void 0) {
+		process.stderr.write(`[${command}] pass --sql or --query, not both\n`);
+		return 2;
+	}
+	if (options.sql === void 0 && options.query === void 0) {
+		process.stderr.write(`[${command}] pass --sql <text> or --query <savedName>\n`);
+		return 2;
+	}
+	const { signal, getAbortReason } = createRuntimeSignal({});
+	try {
+		const inputBytes = await readInput(input, { signal });
+		const pkg = decodePackage(new Uint8Array(inputBytes));
+		const resolved = resolveQuerySql(pkg, options);
+		if ("errorMessage" in resolved) {
+			process.stderr.write(`[${command}] ${resolved.errorMessage}\n`);
+			return 2;
+		}
+		const result = evaluateSelect(parseSelect(resolved.sql), readOdbTables(pkg));
+		if (options.json) {
+			process.stdout.write(`${JSON.stringify(result)}\n`);
+			return 0;
+		}
+		for (const line of formatSqlResultSetTable(result)) process.stdout.write(`${line}\n`);
+		return 0;
+	} catch (error) {
+		return reportOdbError(command, error, false, getAbortReason());
+	}
+}
 async function runOdbForms(input, options) {
 	const command = "odb-forms";
 	const { signal, getAbortReason } = createRuntimeSignal({});
@@ -904,6 +975,93 @@ async function runOdbReports(input, options) {
 		return reportOdbError(command, error, false, getAbortReason());
 	}
 }
+const ODB_REPORT_TARGET_FORMATS = {
+	docx: true,
+	odt: true,
+	pdf: true
+};
+function isOdbReportTargetFormat(format) {
+	return format in ODB_REPORT_TARGET_FORMATS;
+}
+function renderOdbReportBytes(content, target, options) {
+	if (target === "docx") return encodePackage(buildDocxPackage(content));
+	if (target === "odt") return encodePackage$1(buildOdtPackage(content));
+	if (content.kind !== "wordprocessing") throw new Error("readOdbReportContent returned a non-wordprocessing ContentDocument");
+	const fonts = createFontRegistry({
+		fonts: options.fonts,
+		onSubstitution: (substitution) => {
+			if (options.reportFontSubstitution !== void 0) {
+				options.reportFontSubstitution(substitution);
+				return;
+			}
+			options.onDiagnosticCounted();
+			options.reporter.report(fontSubstitutionToDiagnostic(substitution));
+		}
+	});
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(fonts) });
+	return writePdf(layout, {
+		signal: options.signal,
+		onSubstitution: (substitution, context) => {
+			options.onDiagnosticCounted();
+			options.reporter.report(substitutionToDiagnostic(substitution, context.pageIndex));
+		},
+		formulas,
+		fonts
+	});
+}
+async function runOdbRenderReport(input, output, options) {
+	const command = "odb-render-report";
+	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
+		process.stderr.write(`[${command}] conflicting output destinations: positional '${output}' and --out '${options.out}'\n`);
+		return 2;
+	}
+	const target = resolveTargetFormat(output, options.out, options.to);
+	if ("errorMessage" in target) {
+		process.stderr.write(`[${command}] ${target.errorMessage}\n`);
+		return 2;
+	}
+	if (!isOdbReportTargetFormat(target.format)) {
+		process.stderr.write(`[${command}] '${target.format}' is not a supported report render target; expected one of docx, odt, pdf\n`);
+		return 2;
+	}
+	const targetFormat = target.format;
+	const resolvedOutput = output ?? options.out ?? (input === "-" ? "-" : resolveDefaultOutputPath(input, targetFormat));
+	const { signal, getAbortReason } = createRuntimeSignal({ timeoutMs: options.timeout });
+	const reporter = createDiagnosticReporter({
+		json: options.json,
+		quiet: options.quiet,
+		command
+	});
+	let diagnosticCount = 0;
+	const reportFontSubstitution = options.reportFontSubstitutions === true ? createFontSubstitutionReporter({
+		json: options.json,
+		quiet: options.quiet,
+		command
+	}) : void 0;
+	try {
+		const inputBytes = await readInput(input, { signal });
+		const fonts = await loadProvidedFonts(options.fontFile ?? [], { signal });
+		const pkg = decodePackage(new Uint8Array(inputBytes));
+		const bytes = renderOdbReportBytes(readOdbReportContent(pkg, { report: options.report }), targetFormat, {
+			fonts,
+			signal,
+			reporter,
+			reportFontSubstitution,
+			onDiagnosticCounted: () => {
+				diagnosticCount += 1;
+			}
+		});
+		await writeOutput(resolvedOutput, bytes);
+		reporter.summarize({
+			output: resolvedOutput,
+			bytes: bytes.byteLength,
+			diagnosticCount
+		});
+		return 0;
+	} catch (error) {
+		return reportOdbReportError(command, error, options.verbose, getAbortReason());
+	}
+}
 function registerOdbToXlsxCommand(program) {
 	const command = program.command("odb-to-xlsx <input> [output]").description("extract every table an embedded .odb database declares into one xlsx workbook, one sheet per table");
 	addOutOption(command);
@@ -942,12 +1100,33 @@ function registerOdbReportsCommand(program) {
 		process.exitCode = await runOdbReports(input, options);
 	});
 }
+function registerOdbQueryCommand(program) {
+	program.command("odb-query <input>").description("run a bounded SELECT over an embedded .odb database's own extracted tables, given directly or by naming one of its saved queries").option("--sql <text>", "the SELECT statement to run -- mutually exclusive with --query").option("--query <savedName>", "the name of one of the .odb's own saved queries to run -- mutually exclusive with --sql").option("--json", "emit the result set as JSON ({ columns, rows }) instead of a plain-text table", false).action(async (input, options) => {
+		process.exitCode = await runOdbQuery(input, options);
+	});
+}
+function registerOdbRenderReportCommand(program) {
+	const command = program.command("odb-render-report <input> [output]").description("render one of an .odb's own reports -- its query resolved, its rpt: formulas evaluated, its bands laid out -- to docx, odt, or pdf");
+	addOutOption(command);
+	addTimeoutOption(command);
+	addJsonOption(command);
+	addQuietOption(command);
+	addVerboseOption(command);
+	addFontOptions(command);
+	command.option("--report <name>", "the report to render -- required only when the .odb declares more than one report");
+	command.option("--to <format>", "target format when it cannot be inferred from the output path (docx, odt, pdf)");
+	command.action(async (input, output, options) => {
+		process.exitCode = await runOdbRenderReport(input, output, options);
+	});
+}
 function registerOdbCommands(program) {
 	registerOdbToXlsxCommand(program);
 	registerOdbToCsvCommand(program);
 	registerOdbTablesCommand(program);
 	registerOdbFormsCommand(program);
 	registerOdbReportsCommand(program);
+	registerOdbQueryCommand(program);
+	registerOdbRenderReportCommand(program);
 }
 //#endregion
 //#region src/commands/odm.ts
@@ -1128,7 +1307,7 @@ function registerPdfInspectCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.11";
+var version = "1.3.0";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/{tui-DD4bQp39.js → tui-C8ITn1zQ.js}

@@ -1,8 +1,8 @@
 import { d as inferFormatFromExtension, i as formatOdbReportLines, l as loadProvidedFonts, n as describeOdbReport, o as readInput, r as formatOdbFormLines, t as describeOdbForm, u as formatToExtension } from "./odb-structure-CX_0zL8_.js";
 import { readFile, writeFile } from "node:fs/promises";
-import { createDocx, createOdg, createOdp, createOds, createOdt, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, hsqldbCellDisplayText, markdownToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openOdg, openOdp, openOds, openOdt, openPptx, pptxToPdf, readOdbForms, readOdbReports, readOdbTables, readOdgContent, readOdsContent, readPdf, rgbHexToColor, xlsxToPdf } from "documents.js";
+import { buildDocxPackage, buildOdtPackage, convertWordprocessingToLayout, createDocx, createFontMeasurer, createFontRegistry, createOdg, createOdp, createOds, createOdt, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, encodePackage, hsqldbCellDisplayText, markdownToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openOdg, openOdp, openOds, openOdt, openPptx, pptxToPdf, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdsContent, readPdf, rgbHexToColor, writePdf, xlsxToPdf } from "documents.js";
 import { basename, dirname, extname, join } from "node:path";
-import { cellReference, columnIndexToLetters, decodePackage } from "odf.js";
+import { cellReference, columnIndexToLetters, decodePackage, encodePackage as encodePackage$1 } from "odf.js";
 import { readdirSync } from "node:fs";
 import { Box, Text, render, useApp, useInput, useWindowSize } from "ink";
 import { createContext, useContext, useEffect, useReducer, useState } from "react";
@@ -238,6 +238,7 @@ function selectionKeyFor(screen) {
 		case "odbTableRows": return `odbTableRows:${screen.tableName}`;
 		case "odbFormDetail": return `odbFormDetail:${screen.formName}`;
 		case "odbReportDetail": return `odbReportDetail:${screen.reportName}`;
+		case "odbReportRender": return `odbReportRender:${screen.reportName}`;
 		case "markdownLineEditor": return `markdownLineEditor:${screen.lineIndex}`;
 	}
 }
@@ -2537,7 +2538,15 @@ function OdbReportDetailScreen() {
 	const lines = query === "" ? allLines : allLines.filter((line) => line.toLowerCase().includes(query));
 	const { selectedIndex } = useNavigationInput({
 		itemCount: lines.length,
-		onSelect: () => {},
+		onSelect: () => {
+			dispatch({
+				type: "PUSH_SCREEN",
+				screen: {
+					kind: "odbReportRender",
+					reportName: report.name
+				}
+			});
+		},
 		onBack: () => {
 			dispatch({ type: "POP_SCREEN" });
 		},
@@ -2574,7 +2583,7 @@ function OdbReportDetailScreen() {
 			}),
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
-				children: "Esc to go back to the report list"
+				children: "Enter to render this report, Esc to go back to the report list"
 			})
 		]
 	});
@@ -2636,6 +2645,146 @@ function OdbReportListScreen() {
 	});
 }
 //#endregion
+//#region src/tui/format/render-odb-report.ts
+const REPORT_RENDER_TARGET_FORMATS = {
+	docx: true,
+	odt: true,
+	pdf: true
+};
+function isReportRenderTargetFormat(format) {
+	return format !== void 0 && format in REPORT_RENDER_TARGET_FORMATS;
+}
+function renderReportBytes(content, format, fonts, options) {
+	if (format === "docx") return encodePackage(buildDocxPackage(content));
+	if (format === "odt") return encodePackage$1(buildOdtPackage(content));
+	if (content.kind !== "wordprocessing") throw new Error("readOdbReportContent returned a non-wordprocessing ContentDocument");
+	const registry = createFontRegistry({
+		fonts,
+		onSubstitution: (substitution) => {
+			const requested = `${substitution.requestedFamily}${substitution.requestedBold ? " bold" : ""}${substitution.requestedItalic ? " italic" : ""}`;
+			options.onDiagnostic({
+				severity: "info",
+				message: `No "${requested}" face available; drew it in "${substitution.resolvedFamily}"`
+			});
+		}
+	});
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(registry) });
+	return writePdf(layout, {
+		signal: options.signal,
+		onSubstitution: (substitution, context) => {
+			options.onDiagnostic({
+				severity: "info",
+				message: `Substituted "${substitution.to}" for "${substitution.from}"`,
+				pageIndex: context.pageIndex
+			});
+		},
+		formulas,
+		fonts: registry
+	});
+}
+async function renderOdbReportTo(doc, destinationPath, options) {
+	const format = detectFormat(destinationPath);
+	if (!isReportRenderTargetFormat(format)) throw new Error(`Cannot tell whether to render "${options.reportName}" as docx, odt, or pdf from '${destinationPath}' -- give the destination one of those three extensions`);
+	const fonts = await loadProvidedFonts(options.fontFiles ?? [], { signal: options.signal });
+	const pkg = decodePackage(new Uint8Array(await readFile(doc.path)));
+	const bytes = renderReportBytes(readOdbReportContent(pkg, { report: options.reportName }), format, fonts, options);
+	await writeFile(destinationPath, bytes);
+}
+//#endregion
+//#region src/tui/screens/editors/odb/report-render.tsx
+function defaultReportRenderDestination(odbPath, reportName) {
+	return join(dirname(odbPath), `${reportName}.pdf`);
+}
+function parseFontFileField$1(value) {
+	return value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+}
+function OdbReportRenderScreen() {
+	const state = useAppState();
+	const dispatch = useAppDispatch();
+	const isActive = !anyOverlayOpen(state);
+	const doc = requireOdbDocument(state.openDocument);
+	const screen = currentScreen(state);
+	if (screen.kind !== "odbReportRender") throw new Error(`OdbReportRenderScreen rendered while the current screen is "${screen.kind}", not "odbReportRender".`);
+	const reportName = screen.reportName;
+	const [destination, setDestination] = useState(() => defaultReportRenderDestination(doc.path, reportName));
+	const [fontFiles, setFontFiles] = useState("");
+	const [field, setField] = useState("destination");
+	const cancel = () => {
+		dispatch({ type: "POP_SCREEN" });
+	};
+	const submit = () => {
+		(async () => {
+			let diagnosticCount = 0;
+			try {
+				await renderOdbReportTo(doc, destination, {
+					reportName,
+					fontFiles: parseFontFileField$1(fontFiles),
+					onDiagnostic: (diagnostic) => {
+						diagnosticCount += 1;
+						dispatch({
+							type: "APPEND_DIAGNOSTIC",
+							diagnostic
+						});
+					}
+				});
+				dispatch({
+					type: "SET_STATUS",
+					severity: "info",
+					text: `Rendered "${reportName}" to ${destination}`
+				});
+				if (diagnosticCount > 0) dispatch({
+					type: "OPEN_OVERLAY",
+					overlay: "diagnosticsPanel"
+				});
+				dispatch({ type: "POP_SCREEN" });
+			} catch (error) {
+				dispatch({
+					type: "OPEN_FILE_ERROR",
+					message: `Could not render "${reportName}" to ${destination}`,
+					detail: describeError(error)
+				});
+			}
+		})();
+	};
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [
+			/* @__PURE__ */ jsxs(Text, {
+				bold: true,
+				children: ["Render report: ", reportName]
+			}),
+			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Path: "
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: destination,
+				isFocused: isActive && field === "destination",
+				placeholder: "destination path (.docx, .odt, or .pdf)",
+				onChange: setDestination,
+				onSubmit: () => {
+					setField("fonts");
+				},
+				onCancel: cancel
+			})] }),
+			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: "Fonts: "
+			}), /* @__PURE__ */ jsx(TextField, {
+				value: fontFiles,
+				isFocused: isActive && field === "fonts",
+				placeholder: "optional .ttf/.otf paths, comma-separated -- pdf only",
+				onChange: setFontFiles,
+				onSubmit: submit,
+				onCancel: cancel
+			})] }),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: field === "destination" ? "Enter for fonts, Esc to cancel" : "Enter to render, Esc to cancel. The destination's own extension picks docx/odt/pdf"
+			})
+		]
+	});
+}
+//#endregion
 //#region src/tui/screens/editors/odb/table-list.tsx
 const TABLE_LIST_RESERVED_ROWS = 5;
 function OdbTableListScreen() {
@@ -6061,6 +6210,7 @@ function ScreenBody({ screen }) {
 		case "odbFormDetail": return /* @__PURE__ */ jsx(OdbFormDetailScreen, {});
 		case "odbReportList": return /* @__PURE__ */ jsx(OdbReportListScreen, {});
 		case "odbReportDetail": return /* @__PURE__ */ jsx(OdbReportDetailScreen, {});
+		case "odbReportRender": return /* @__PURE__ */ jsx(OdbReportRenderScreen, {});
 		case "markdownLineList": return /* @__PURE__ */ jsx(MarkdownLineListScreen, {});
 		case "markdownLineEditor": return /* @__PURE__ */ jsx(MarkdownLineEditorScreen, {});
 		case "pdfPageList": return /* @__PURE__ */ jsx(PdfPageListScreen, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-cli",
-  "version": "1.2.11",
+  "version": "1.3.0",
   "description": "CLI and interactive Ink TUI for documents.js: every docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/markdown conversion, bridge, and editor as a scriptable command or a terminal app.",
   "type": "module",
   "repository": {