document-cli 1.11.0 → 1.11.2

package/dist/cli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { a as odbFormSummary, c as formatDocxExtrasLines, d as writeOutput, f as loadProvidedFonts, h as isDocumentFormat, i as formatOdbReportLines, l as readInput, m as inferFormatFromExtension, n as describeOdbReport, o as formatMetadataLines, r as formatOdbFormLines, s as presentMetadataEntries, t as describeOdbForm, u as resolveDefaultOutputPath } from "./odb-structure-Du1w_hOU.js";
+import { a as odbFormSummary, c as formatDocxExtrasLines, d as writeOutput, f as loadProvidedFonts, h as isDocumentFormat, i as formatOdbReportLines, l as readInput, m as inferFormatFromExtension, n as describeOdbReport, o as formatMetadataLines, r as formatOdbFormLines, s as presentMetadataEntries, t as describeOdbForm, u as resolveDefaultOutputPath } from "./odb-structure-CS2Eybob.js";
 import { Command, CommanderError, InvalidArgumentError } from "commander";
 import { writeFile } from "node:fs/promises";
-import { HsqldbSqlEvaluationError, HsqldbSqlParseError, HsqldbSqlUnsupportedError, OdbNoEmbeddedDataSourceError, OdbReportNotSpecifiedError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, UnrecognizedDocumentSchemaError, buildDocxPackage, buildMarkdownText, buildOdgPackage, buildOdpPackage, buildOdsPackage, buildOdtPackage, buildPptxPackage, convertWordprocessingToLayout, createFontMeasurer, createFontRegistry, createLocalDocumentConverter, decodeMarkdownText, decodePackage, documentFromJson, documentPackageWithSchema, encodeMarkdownText, encodePackage, evaluateSelect, extractSourceFonts, hsqldbCellDisplayText, layoutDocumentWithSchema, odbToCsv, odbToXlsx, odmToPdf, parseSelect, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbInventory, readOdbReportContent, readOdbReports, readOdbTables, readOdfFormulaContent, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, writePdf, xlsxToPdf } from "documents.js";
+import { HsqldbSqlEvaluationError, HsqldbSqlParseError, HsqldbSqlUnsupportedError, OdbNoEmbeddedDataSourceError, OdbReportNotSpecifiedError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, UnrecognizedDocumentSchemaError, UnsupportedFontSourceFormatError, buildDocumentBytes, createLocalDocumentConverter, decodePackage, documentFromJson, documentPackageWithSchema, evaluateSelect, extractSourceFontsForFormat, hsqldbCellDisplayText, layoutDocumentWithSchema, odbReportToDocx, odbReportToOdt, odbReportToPdf, odbToCsv, odbToXlsx, odmToPdf, parseSelect, readDocumentMetadata, readDocxExtras, readOdbForms, readOdbInventory, readOdbReportContent, readOdbReports, readOdbTables, readPdf, setDocumentMetadata } from "documents.js";
 import { basename, dirname, extname, join } from "node:path";
-import { decodePackage as decodePackage$1, encodePackage as encodePackage$1 } from "odf.js";
+import { decodePackage as decodePackage$1 } from "odf.js";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/runtime/abort.ts
 function combineSignals(a, b) {
@@ -116,6 +116,7 @@ function mapErrorToExit(error, abortReason) {
 	if (abortReason === "timeout") return 124;
 	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 UnsupportedFontSourceFormatError) return 2;
 	if (error instanceof PdfEncryptedError || error instanceof PdfParseError) return 1;
 	return 1;
 }
@@ -306,27 +307,6 @@ function registerDocxExtrasCommand(program) {
 }
 //#endregion
 //#region src/commands/fonts.ts
-const FONT_SOURCE_FORMATS = {
-	docx: true,
-	pptx: true,
-	odt: true,
-	odp: true,
-	ods: true,
-	odg: true
-};
-function isFontSourceFormat(format) {
-	return format in FONT_SOURCE_FORMATS;
-}
-function resolveFontSourcePackage(format, bytes) {
-	if (format === "docx" || format === "pptx") return {
-		kind: format,
-		package: decodePackage(bytes)
-	};
-	return {
-		kind: "odf",
-		package: decodePackage$1(bytes)
-	};
-}
 async function runFonts(input, options) {
 	const command = "fonts";
 	const { signal, getAbortReason } = createRuntimeSignal({});
@@ -336,13 +316,8 @@ async function runFonts(input, options) {
 			process.stderr.write(`[${command}] cannot infer a document format from '${input}'; expected one of docx, pptx, odt, odp, ods, odg\n`);
 			return 2;
 		}
-		if (!isFontSourceFormat(format)) {
-			process.stderr.write(`[${command}] '${format}' documents carry no source-embedded font faces this command can extract; expected one of docx, pptx, odt, odp, ods, odg\n`);
-			return 2;
-		}
 		const inputBytes = await readInput(input, { signal });
-		const source = resolveFontSourcePackage(format, new Uint8Array(inputBytes));
-		const summaries = extractSourceFonts(source).map((face) => ({
+		const summaries = extractSourceFontsForFormat(format, new Uint8Array(inputBytes)).map((face) => ({
 			family: face.family,
 			bold: face.bold,
 			italic: face.italic,
@@ -387,23 +362,6 @@ function registerFormatsCommand(program) {
 }
 //#endregion
 //#region src/commands/from-package.ts
-function buildBytesForTarget(pkg, target) {
-	if (target === "pdf") {
-		if (pkg.layout === void 0) throw new Error("this DocumentPackage has no layout -- only a package dumped from a <format>-to-pdf or pdf-to-<format> conversion carries one; a bridge conversion's own dump (e.g. odt-to-docx) never does, so 'pdf' is not a reachable target from it");
-		return writePdf(pkg.layout);
-	}
-	switch (target) {
-		case "docx": return encodePackage(buildDocxPackage(pkg.content));
-		case "pptx": return encodePackage(buildPptxPackage(pkg.content));
-		case "odt": return encodePackage$1(buildOdtPackage(pkg.content));
-		case "odp": return encodePackage$1(buildOdpPackage(pkg.content));
-		case "ods": return encodePackage$1(buildOdsPackage(pkg.content));
-		case "odg": return encodePackage$1(buildOdgPackage(pkg.content));
-		case "markdown": return encodeMarkdownText(buildMarkdownText(pkg.content));
-		case "xlsx": throw new Error("'xlsx' cannot be built from a DocumentPackage directly -- documents.js does not re-export a ContentDocument-to-xlsx builder; convert to 'ods' here, then run 'ods-to-xlsx' on the result instead");
-		case "odf": throw new Error("'odf' (a standalone formula document) cannot be built from a DocumentPackage -- there is no ContentDocument-to-odf builder");
-	}
-}
 async function runFromPackage(input, output, options) {
 	const command = "from-package";
 	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
@@ -432,7 +390,7 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' is a ${result.kind}, not a DocumentPackage -- only a file written by --dump-package can be read back by this command\n`);
 			return 2;
 		}
-		const bytes = buildBytesForTarget(result.value, target.format);
+		const bytes = buildDocumentBytes(result.value, target.format);
 		await writeOutput(resolvedOutput, bytes);
 		createDiagnosticReporter({
 			json: options.json,
@@ -467,20 +425,6 @@ function registerFromPackageCommand(program) {
 }
 //#endregion
 //#region src/commands/metadata.ts
-function readMetadataForFormat(format, bytes, signal) {
-	switch (format) {
-		case "docx": return readDocxContent(decodePackage(bytes)).metadata;
-		case "pptx": return readPptxContent(decodePackage(bytes)).metadata;
-		case "odt": return readOdtContent(decodePackage$1(bytes)).metadata;
-		case "odp": return readOdpContent(decodePackage$1(bytes)).metadata;
-		case "ods": return readOdsContent(decodePackage$1(bytes)).metadata;
-		case "odg": return readOdgContent(decodePackage$1(bytes)).metadata;
-		case "odf": return readOdfFormulaContent(decodePackage$1(bytes)).metadata;
-		case "markdown": return readMarkdownContent(decodeMarkdownText(bytes)).metadata;
-		case "pdf": return readPdf(bytes, { signal }).metadata;
-		case "xlsx": return readPdf(xlsxToPdf(bytes, { signal }), { signal }).metadata;
-	}
-}
 async function runMetadata(input, options) {
 	const command = "metadata";
 	const source = inferFormatFromExtension(input);
@@ -491,7 +435,7 @@ async function runMetadata(input, options) {
 	const { signal, getAbortReason } = createRuntimeSignal({});
 	try {
 		const inputBytes = await readInput(input, { signal });
-		const metadata = readMetadataForFormat(source, new Uint8Array(inputBytes), signal);
+		const metadata = readDocumentMetadata(source, new Uint8Array(inputBytes), { signal });
 		if (options.json) {
 			process.stdout.write(`${JSON.stringify(metadata)}\n`);
 			return 0;
@@ -739,32 +683,6 @@ const ODB_REPORT_TARGET_FORMATS = {
 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) {
@@ -798,13 +716,21 @@ async function runOdbRenderReport(input, output, options) {
 		const inputBytes = await readInput(input, { signal });
 		const fonts = await loadProvidedFonts(options.fontFile ?? [], { signal });
 		const pkg = decodePackage$1(new Uint8Array(inputBytes));
-		const bytes = renderOdbReportBytes(readOdbReportContent(pkg, { report: options.report }), targetFormat, {
-			fonts,
+		const content = readOdbReportContent(pkg, { report: options.report });
+		const bytes = targetFormat === "docx" ? odbReportToDocx(content) : targetFormat === "odt" ? odbReportToOdt(content) : odbReportToPdf(content, {
 			signal,
-			reporter,
-			reportFontSubstitution,
-			onDiagnosticCounted: () => {
+			fonts,
+			onFontSubstitution: (substitution) => {
+				if (reportFontSubstitution !== void 0) {
+					reportFontSubstitution(substitution);
+					return;
+				}
+				diagnosticCount += 1;
+				reporter.report(fontSubstitutionToDiagnostic(substitution));
+			},
+			onSubstitution: (substitution, context) => {
 				diagnosticCount += 1;
+				reporter.report(substitutionToDiagnostic(substitution, context.pageIndex));
 			}
 		});
 		await writeOutput(resolvedOutput, bytes);
@@ -1047,63 +973,9 @@ function registerPdfInspectCommand(program) {
 }
 //#endregion
 //#region src/commands/set-metadata.ts
-const REBUILD_FORMATS = {
-	docx: true,
-	pptx: true,
-	odt: true,
-	odp: true,
-	ods: true,
-	odg: true,
-	markdown: true
-};
-function isRebuildFormat(format) {
-	return format in REBUILD_FORMATS;
-}
-function readContentForFormat(format, bytes) {
-	switch (format) {
-		case "docx": return readDocxContent(decodePackage(bytes));
-		case "pptx": return readPptxContent(decodePackage(bytes));
-		case "odt": return readOdtContent(decodePackage$1(bytes));
-		case "odp": return readOdpContent(decodePackage$1(bytes));
-		case "ods": return readOdsContent(decodePackage$1(bytes));
-		case "odg": return readOdgContent(decodePackage$1(bytes));
-		case "markdown": return readMarkdownContent(decodeMarkdownText(bytes));
-	}
-}
-function buildBytesForRebuildFormat(format, content) {
-	switch (format) {
-		case "docx": return encodePackage(buildDocxPackage(content));
-		case "pptx": return encodePackage(buildPptxPackage(content));
-		case "odt": return encodePackage$1(buildOdtPackage(content));
-		case "odp": return encodePackage$1(buildOdpPackage(content));
-		case "ods": return encodePackage$1(buildOdsPackage(content));
-		case "odg": return encodePackage$1(buildOdgPackage(content));
-		case "markdown": return encodeMarkdownText(buildMarkdownText(content));
-	}
-}
-function mergeMetadata(current, overrides) {
-	return {
-		...current,
-		...overrides.title !== void 0 ? { title: overrides.title } : {},
-		...overrides.author !== void 0 ? { author: overrides.author } : {},
-		...overrides.subject !== void 0 ? { subject: overrides.subject } : {},
-		...overrides.keywords !== void 0 ? { keywords: overrides.keywords } : {}
-	};
-}
 function parseKeywords(csv) {
 	return csv.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
 }
-function classifyWritePath(source, target) {
-	if (source === "pdf" && target === "pdf") return { kind: "pdf" };
-	if (target === "xlsx" || source === "xlsx") return { errorMessage: "'xlsx' is not a supported set-metadata source or target -- documents.js does not re-export a ContentDocument-to-xlsx builder or a readXlsxContent from its own public surface (see that package's own README, Architecture section); convert with 'xlsx-to-ods'/'ods-to-xlsx' first, then set metadata on the ods" };
-	if (target === "odf" || source === "odf") return { errorMessage: "'odf' (a standalone formula document) is not a supported set-metadata source or target -- it has no write path back out at all" };
-	if (!isRebuildFormat(source) || !isRebuildFormat(target)) return { errorMessage: `set-metadata only patches metadata in place; it does not convert format -- source ('${source}') and target ('${target}') must be the same format (or both 'pdf'). Run 'convert'/'from-package' first if you need a different target format.` };
-	if (source !== target) return { errorMessage: `set-metadata only patches metadata in place; it does not convert format -- source ('${source}') and target ('${target}') must be the same format. Run 'convert'/'from-package' first if you need a different target format.` };
-	return {
-		kind: "rebuild",
-		format: source
-	};
-}
 async function runSetMetadata(input, output, options) {
 	const command = "set-metadata";
 	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
@@ -1120,11 +992,6 @@ async function runSetMetadata(input, output, options) {
 		process.stderr.write(`[${command}] cannot infer a source format from '${input}'; rename the file with a recognised extension (${KNOWN_DOCUMENT_FORMATS})\n`);
 		return 2;
 	}
-	const writePath = classifyWritePath(source, target.format);
-	if ("errorMessage" in writePath) {
-		process.stderr.write(`[${command}] ${writePath.errorMessage}\n`);
-		return 2;
-	}
 	const overrides = {
 		title: options.setTitle,
 		author: options.setAuthor,
@@ -1135,21 +1002,7 @@ async function runSetMetadata(input, output, options) {
 	const { signal, getAbortReason } = createRuntimeSignal({ timeoutMs: options.timeout });
 	try {
 		const inputBytes = await readInput(input, { signal });
-		const bytes = writePath.kind === "pdf" ? (() => {
-			const layout = readPdf(new Uint8Array(inputBytes), { signal });
-			const patched = {
-				...layout,
-				metadata: mergeMetadata(layout.metadata, overrides)
-			};
-			return writePdf(patched, { signal });
-		})() : (() => {
-			const content = readContentForFormat(writePath.format, new Uint8Array(inputBytes));
-			const nextContent = {
-				...content,
-				metadata: mergeMetadata(content.metadata, overrides)
-			};
-			return buildBytesForRebuildFormat(writePath.format, nextContent);
-		})();
+		const bytes = setDocumentMetadata(source, target.format, new Uint8Array(inputBytes), overrides, { signal });
 		await writeOutput(resolvedOutput, bytes);
 		createDiagnosticReporter({
 			json: options.json,
@@ -1194,7 +1047,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "1.11.0";
+var version = "1.11.2";
 //#endregion
 //#region src/program.ts
 function createProgram() {
@@ -1221,7 +1074,7 @@ function createProgram() {
 //#region src/cli.ts
 async function launchTui(startPath, signal) {
 	try {
-		const { runTui } = await import("./tui-DWXPty2k.js");
+		const { runTui } = await import("./tui-Bw_z7xq6.js");
 		await runTui({
 			startPath,
 			signal