document-cli 1.11.0 → 1.11.1

package/dist/index.js

@@ -1,8 +1,9 @@
 import { readFile, 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 { readFontFace } from "pdf-codec";
 import { basename, dirname, extname, join } from "node:path";
 import { Command, InvalidArgumentError } from "commander";
-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/format.ts
 const EXTENSION_TO_FORMAT = {
@@ -163,166 +164,17 @@ 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;
 }
 //#endregion
-//#region src/runtime/font-face.ts
-var FontFaceError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "FontFaceError";
-	}
-};
-const SFNT_VERSION_TRUETYPE = 65536;
-const SFNT_VERSION_CFF = 1330926671;
-const SFNT_VERSION_APPLE_TRUE = 1953658213;
-const SFNT_VERSION_APPLE_TYP1 = 1954115633;
-const SFNT_VERSION_COLLECTION = 1953784678;
-const SFNT_VERSIONS = /* @__PURE__ */ new Set([
-	SFNT_VERSION_TRUETYPE,
-	SFNT_VERSION_CFF,
-	SFNT_VERSION_APPLE_TRUE,
-	SFNT_VERSION_APPLE_TYP1
-]);
-const TABLE_DIRECTORY_HEADER_SIZE = 12;
-const TABLE_RECORD_SIZE = 16;
-const TABLE_TAG_SIZE = 4;
-const NAME_HEADER_SIZE = 6;
-const NAME_RECORD_SIZE = 12;
-const NAME_ID_FAMILY = 1;
-const NAME_ID_TYPOGRAPHIC_FAMILY = 16;
-const PLATFORM_UNICODE = 0;
-const PLATFORM_MACINTOSH = 1;
-const PLATFORM_WINDOWS = 3;
-const MACINTOSH_ENCODING_ROMAN = 0;
-const OS2_FS_SELECTION_OFFSET = 62;
-const OS2_MINIMUM_SIZE = 64;
-const OS2_FS_SELECTION_ITALIC = 1;
-const OS2_FS_SELECTION_BOLD = 32;
-const HEAD_MAC_STYLE_OFFSET = 44;
-const HEAD_MINIMUM_SIZE = 46;
-const HEAD_MAC_STYLE_BOLD = 1;
-const HEAD_MAC_STYLE_ITALIC = 2;
-function viewOf(bytes) {
-	return new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-}
-function decodeTag(view, offset) {
-	let tag = "";
-	for (let i = 0; i < TABLE_TAG_SIZE; i++) tag += String.fromCharCode(view.getUint8(offset + i));
-	return tag;
-}
-function decodeUtf16Be(view, offset, length) {
-	let text = "";
-	for (let i = 0; i + 1 < length; i += 2) text += String.fromCharCode(view.getUint16(offset + i));
-	return text;
-}
-function decodeMacintoshAscii(view, offset, length) {
-	let text = "";
-	for (let i = 0; i < length; i++) {
-		const byte = view.getUint8(offset + i);
-		if (byte > 126) return;
-		text += String.fromCharCode(byte);
-	}
-	return text;
-}
-function readTableDirectory(view, source) {
-	if (view.byteLength < TABLE_DIRECTORY_HEADER_SIZE) throw new FontFaceError(`${source} is too short to be a font file (${String(view.byteLength)} bytes)`);
-	const sfntVersion = view.getUint32(0);
-	if (sfntVersion === SFNT_VERSION_COLLECTION) throw new FontFaceError(`${source} is a TrueType Collection (.ttc), which packs several faces into one file; extract the single face you want and pass that instead`);
-	if (!SFNT_VERSIONS.has(sfntVersion)) throw new FontFaceError(`${source} is not a TrueType/OpenType font file (no recognised sfnt version); a .woff/.woff2 file must be converted to .ttf/.otf first`);
-	const numTables = view.getUint16(4);
-	if (view.byteLength < TABLE_DIRECTORY_HEADER_SIZE + numTables * TABLE_RECORD_SIZE) throw new FontFaceError(`${source} declares ${String(numTables)} tables but is too short to hold that many table records`);
-	const tables = /* @__PURE__ */ new Map();
-	for (let i = 0; i < numTables; i++) {
-		const recordOffset = TABLE_DIRECTORY_HEADER_SIZE + i * TABLE_RECORD_SIZE;
-		const tag = decodeTag(view, recordOffset);
-		const offset = view.getUint32(recordOffset + 8);
-		const length = view.getUint32(recordOffset + 12);
-		if (offset + length > view.byteLength || tables.has(tag)) continue;
-		tables.set(tag, {
-			offset,
-			length
-		});
-	}
-	return tables;
-}
-function tableView(bytes, table) {
-	return new DataView(bytes.buffer, bytes.byteOffset + table.offset, table.length);
-}
-function readNameRecords(name) {
-	if (name.byteLength < NAME_HEADER_SIZE) return [];
-	const count = name.getUint16(2);
-	const storageOffset = name.getUint16(4);
-	if (name.byteLength < NAME_HEADER_SIZE + count * NAME_RECORD_SIZE) return [];
-	const records = [];
-	for (let i = 0; i < count; i++) {
-		const recordOffset = NAME_HEADER_SIZE + i * NAME_RECORD_SIZE;
-		records.push({
-			platformId: name.getUint16(recordOffset),
-			encodingId: name.getUint16(recordOffset + 2),
-			nameId: name.getUint16(recordOffset + 6),
-			length: name.getUint16(recordOffset + 8),
-			stringOffset: storageOffset + name.getUint16(recordOffset + 10)
-		});
-	}
-	return records;
-}
-function platformPreference(record) {
-	if (record.platformId === PLATFORM_WINDOWS) return 0;
-	if (record.platformId === PLATFORM_UNICODE) return 1;
-	if (record.platformId === PLATFORM_MACINTOSH && record.encodingId === MACINTOSH_ENCODING_ROMAN) return 2;
-	return Number.POSITIVE_INFINITY;
-}
-function readNameString(name, records, nameId) {
-	const candidates = records.filter((record) => record.nameId === nameId && Number.isFinite(platformPreference(record))).sort((left, right) => platformPreference(left) - platformPreference(right));
-	for (const record of candidates) {
-		if (record.stringOffset + record.length > name.byteLength) continue;
-		const text = record.platformId === PLATFORM_MACINTOSH ? decodeMacintoshAscii(name, record.stringOffset, record.length) : decodeUtf16Be(name, record.stringOffset, record.length);
-		if (text !== void 0 && text.length > 0) return text;
-	}
-}
-function readStyleBits(bytes, tables, source) {
-	const os2 = tables.get("OS/2");
-	if (os2 !== void 0 && os2.length >= OS2_MINIMUM_SIZE) {
-		const fsSelection = tableView(bytes, os2).getUint16(OS2_FS_SELECTION_OFFSET);
-		return {
-			bold: (fsSelection & OS2_FS_SELECTION_BOLD) !== 0,
-			italic: (fsSelection & OS2_FS_SELECTION_ITALIC) !== 0
-		};
-	}
-	const head = tables.get("head");
-	if (head !== void 0 && head.length >= HEAD_MINIMUM_SIZE) {
-		const macStyle = tableView(bytes, head).getUint16(HEAD_MAC_STYLE_OFFSET);
-		return {
-			bold: (macStyle & HEAD_MAC_STYLE_BOLD) !== 0,
-			italic: (macStyle & HEAD_MAC_STYLE_ITALIC) !== 0
-		};
-	}
-	throw new FontFaceError(`${source} declares neither a readable 'OS/2' nor a readable 'head' table, so its weight and slope cannot be determined`);
-}
-function describeFontFace(bytes, source) {
-	const tables = readTableDirectory(viewOf(bytes), source);
-	const nameTable = tables.get("name");
-	if (nameTable === void 0) throw new FontFaceError(`${source} declares no 'name' table, so the font family it provides cannot be determined`);
-	const name = tableView(bytes, nameTable);
-	const records = readNameRecords(name);
-	const family = readNameString(name, records, NAME_ID_TYPOGRAPHIC_FAMILY) ?? readNameString(name, records, NAME_ID_FAMILY);
-	if (family === void 0) throw new FontFaceError(`${source} declares no family name in its 'name' table, so the font family it provides cannot be determined`);
-	const { bold, italic } = readStyleBits(bytes, tables, source);
-	return {
-		family,
-		bold,
-		italic
-	};
-}
-//#endregion
 //#region src/runtime/fonts.ts
 async function loadProvidedFonts(paths, options) {
 	const fonts = [];
 	for (const path of paths) {
 		const bytes = new Uint8Array(await readFile(path, { signal: options?.signal }));
-		const face = describeFontFace(bytes, path);
+		const face = readFontFace(bytes, path);
 		fonts.push({
 			family: face.family,
 			bold: face.bold,
@@ -616,27 +468,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({});
@@ -646,13 +477,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,
@@ -697,23 +523,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) {
@@ -742,7 +551,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,
@@ -801,20 +610,6 @@ function formatMetadataLines(metadata) {
 }
 //#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);
@@ -825,7 +620,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;
@@ -1205,32 +1000,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) {
@@ -1264,13 +1033,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);
@@ -1513,63 +1290,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) {
@@ -1586,11 +1309,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,
@@ -1601,21 +1319,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,
@@ -1660,7 +1364,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "1.11.0";
+var version = "1.11.1";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/{odb-structure-Du1w_hOU.js → odb-structure-CS2Eybob.js}

@@ -1,5 +1,6 @@
 import { readFile, writeFile } from "node:fs/promises";
 import "documents.js";
+import { readFontFace } from "pdf-codec";
 import { basename, dirname, extname, join } from "node:path";
 //#region src/format.ts
 const EXTENSION_TO_FORMAT = {
@@ -42,162 +43,12 @@ function formatToExtension(format) {
 	return FORMAT_TO_EXTENSION[format];
 }
 //#endregion
-//#region src/runtime/font-face.ts
-var FontFaceError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "FontFaceError";
-	}
-};
-const SFNT_VERSION_TRUETYPE = 65536;
-const SFNT_VERSION_CFF = 1330926671;
-const SFNT_VERSION_APPLE_TRUE = 1953658213;
-const SFNT_VERSION_APPLE_TYP1 = 1954115633;
-const SFNT_VERSION_COLLECTION = 1953784678;
-const SFNT_VERSIONS = /* @__PURE__ */ new Set([
-	SFNT_VERSION_TRUETYPE,
-	SFNT_VERSION_CFF,
-	SFNT_VERSION_APPLE_TRUE,
-	SFNT_VERSION_APPLE_TYP1
-]);
-const TABLE_DIRECTORY_HEADER_SIZE = 12;
-const TABLE_RECORD_SIZE = 16;
-const TABLE_TAG_SIZE = 4;
-const NAME_HEADER_SIZE = 6;
-const NAME_RECORD_SIZE = 12;
-const NAME_ID_FAMILY = 1;
-const NAME_ID_TYPOGRAPHIC_FAMILY = 16;
-const PLATFORM_UNICODE = 0;
-const PLATFORM_MACINTOSH = 1;
-const PLATFORM_WINDOWS = 3;
-const MACINTOSH_ENCODING_ROMAN = 0;
-const OS2_FS_SELECTION_OFFSET = 62;
-const OS2_MINIMUM_SIZE = 64;
-const OS2_FS_SELECTION_ITALIC = 1;
-const OS2_FS_SELECTION_BOLD = 32;
-const HEAD_MAC_STYLE_OFFSET = 44;
-const HEAD_MINIMUM_SIZE = 46;
-const HEAD_MAC_STYLE_BOLD = 1;
-const HEAD_MAC_STYLE_ITALIC = 2;
-function viewOf(bytes) {
-	return new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-}
-function decodeTag(view, offset) {
-	let tag = "";
-	for (let i = 0; i < TABLE_TAG_SIZE; i++) tag += String.fromCharCode(view.getUint8(offset + i));
-	return tag;
-}
-function decodeUtf16Be(view, offset, length) {
-	let text = "";
-	for (let i = 0; i + 1 < length; i += 2) text += String.fromCharCode(view.getUint16(offset + i));
-	return text;
-}
-function decodeMacintoshAscii(view, offset, length) {
-	let text = "";
-	for (let i = 0; i < length; i++) {
-		const byte = view.getUint8(offset + i);
-		if (byte > 126) return;
-		text += String.fromCharCode(byte);
-	}
-	return text;
-}
-function readTableDirectory(view, source) {
-	if (view.byteLength < TABLE_DIRECTORY_HEADER_SIZE) throw new FontFaceError(`${source} is too short to be a font file (${String(view.byteLength)} bytes)`);
-	const sfntVersion = view.getUint32(0);
-	if (sfntVersion === SFNT_VERSION_COLLECTION) throw new FontFaceError(`${source} is a TrueType Collection (.ttc), which packs several faces into one file; extract the single face you want and pass that instead`);
-	if (!SFNT_VERSIONS.has(sfntVersion)) throw new FontFaceError(`${source} is not a TrueType/OpenType font file (no recognised sfnt version); a .woff/.woff2 file must be converted to .ttf/.otf first`);
-	const numTables = view.getUint16(4);
-	if (view.byteLength < TABLE_DIRECTORY_HEADER_SIZE + numTables * TABLE_RECORD_SIZE) throw new FontFaceError(`${source} declares ${String(numTables)} tables but is too short to hold that many table records`);
-	const tables = /* @__PURE__ */ new Map();
-	for (let i = 0; i < numTables; i++) {
-		const recordOffset = TABLE_DIRECTORY_HEADER_SIZE + i * TABLE_RECORD_SIZE;
-		const tag = decodeTag(view, recordOffset);
-		const offset = view.getUint32(recordOffset + 8);
-		const length = view.getUint32(recordOffset + 12);
-		if (offset + length > view.byteLength || tables.has(tag)) continue;
-		tables.set(tag, {
-			offset,
-			length
-		});
-	}
-	return tables;
-}
-function tableView(bytes, table) {
-	return new DataView(bytes.buffer, bytes.byteOffset + table.offset, table.length);
-}
-function readNameRecords(name) {
-	if (name.byteLength < NAME_HEADER_SIZE) return [];
-	const count = name.getUint16(2);
-	const storageOffset = name.getUint16(4);
-	if (name.byteLength < NAME_HEADER_SIZE + count * NAME_RECORD_SIZE) return [];
-	const records = [];
-	for (let i = 0; i < count; i++) {
-		const recordOffset = NAME_HEADER_SIZE + i * NAME_RECORD_SIZE;
-		records.push({
-			platformId: name.getUint16(recordOffset),
-			encodingId: name.getUint16(recordOffset + 2),
-			nameId: name.getUint16(recordOffset + 6),
-			length: name.getUint16(recordOffset + 8),
-			stringOffset: storageOffset + name.getUint16(recordOffset + 10)
-		});
-	}
-	return records;
-}
-function platformPreference(record) {
-	if (record.platformId === PLATFORM_WINDOWS) return 0;
-	if (record.platformId === PLATFORM_UNICODE) return 1;
-	if (record.platformId === PLATFORM_MACINTOSH && record.encodingId === MACINTOSH_ENCODING_ROMAN) return 2;
-	return Number.POSITIVE_INFINITY;
-}
-function readNameString(name, records, nameId) {
-	const candidates = records.filter((record) => record.nameId === nameId && Number.isFinite(platformPreference(record))).sort((left, right) => platformPreference(left) - platformPreference(right));
-	for (const record of candidates) {
-		if (record.stringOffset + record.length > name.byteLength) continue;
-		const text = record.platformId === PLATFORM_MACINTOSH ? decodeMacintoshAscii(name, record.stringOffset, record.length) : decodeUtf16Be(name, record.stringOffset, record.length);
-		if (text !== void 0 && text.length > 0) return text;
-	}
-}
-function readStyleBits(bytes, tables, source) {
-	const os2 = tables.get("OS/2");
-	if (os2 !== void 0 && os2.length >= OS2_MINIMUM_SIZE) {
-		const fsSelection = tableView(bytes, os2).getUint16(OS2_FS_SELECTION_OFFSET);
-		return {
-			bold: (fsSelection & OS2_FS_SELECTION_BOLD) !== 0,
-			italic: (fsSelection & OS2_FS_SELECTION_ITALIC) !== 0
-		};
-	}
-	const head = tables.get("head");
-	if (head !== void 0 && head.length >= HEAD_MINIMUM_SIZE) {
-		const macStyle = tableView(bytes, head).getUint16(HEAD_MAC_STYLE_OFFSET);
-		return {
-			bold: (macStyle & HEAD_MAC_STYLE_BOLD) !== 0,
-			italic: (macStyle & HEAD_MAC_STYLE_ITALIC) !== 0
-		};
-	}
-	throw new FontFaceError(`${source} declares neither a readable 'OS/2' nor a readable 'head' table, so its weight and slope cannot be determined`);
-}
-function describeFontFace(bytes, source) {
-	const tables = readTableDirectory(viewOf(bytes), source);
-	const nameTable = tables.get("name");
-	if (nameTable === void 0) throw new FontFaceError(`${source} declares no 'name' table, so the font family it provides cannot be determined`);
-	const name = tableView(bytes, nameTable);
-	const records = readNameRecords(name);
-	const family = readNameString(name, records, NAME_ID_TYPOGRAPHIC_FAMILY) ?? readNameString(name, records, NAME_ID_FAMILY);
-	if (family === void 0) throw new FontFaceError(`${source} declares no family name in its 'name' table, so the font family it provides cannot be determined`);
-	const { bold, italic } = readStyleBits(bytes, tables, source);
-	return {
-		family,
-		bold,
-		italic
-	};
-}
-//#endregion
 //#region src/runtime/fonts.ts
 async function loadProvidedFonts(paths, options) {
 	const fonts = [];
 	for (const path of paths) {
 		const bytes = new Uint8Array(await readFile(path, { signal: options?.signal }));
-		const face = describeFontFace(bytes, path);
+		const face = readFontFace(bytes, path);
 		fonts.push({
 			family: face.family,
 			bold: face.bold,

package/dist/{tui-DWXPty2k.js → tui-Bw_z7xq6.js}

@@ -1,8 +1,8 @@
-import { c as formatDocxExtrasLines, f as loadProvidedFonts, i as formatOdbReportLines, l as readInput, m as inferFormatFromExtension, n as describeOdbReport, o as formatMetadataLines, p as formatToExtension, r as formatOdbFormLines, t as describeOdbForm } from "./odb-structure-Du1w_hOU.js";
+import { c as formatDocxExtrasLines, f as loadProvidedFonts, i as formatOdbReportLines, l as readInput, m as inferFormatFromExtension, n as describeOdbReport, o as formatMetadataLines, p as formatToExtension, r as formatOdbFormLines, t as describeOdbForm } from "./odb-structure-CS2Eybob.js";
 import { readFile, writeFile } from "node:fs/promises";
-import { buildDocxPackage, buildOdtPackage, bytesToBase64, convertWordprocessingToLayout, createDocx, createFontMeasurer, createFontRegistry, createOdg, createOdp, createOds, createOdt, createPdf, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, encodePackage, hsqldbCellDisplayText, markdownToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openMarkdown, openOdg, openOdp, openOds, openOdt, openPdf, openPptx, parseXml, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, writePdf, xlsxToPdf } from "documents.js";
+import { bytesToBase64, createDocx, createOdg, createOdp, createOds, createOdt, createPdf, createPptx, decodeMarkdownText, docxToPdf, encodeMarkdownText, hsqldbCellDisplayText, markdownToPdf, odbReportToDocx, odbReportToOdt, odbReportToPdf, odgToPdf, odpToPdf, odsToPdf, odtToPdf, openDocx, openMarkdown, openOdg, openOdp, openOds, openOdt, openPdf, openPptx, parseXml, pptxToPdf, readDocxContent, readDocxExtras, readMarkdownContent, readOdbForms, readOdbReportContent, readOdbReports, readOdbTables, readOdgContent, readOdpContent, readOdsContent, readOdtContent, readPdf, readPptxContent, rgbHexToColor, xlsxToPdf } from "documents.js";
 import { basename, dirname, extname, join } from "node:path";
-import { cellReference, columnIndexToLetters, decodePackage as decodePackage$1, encodePackage as encodePackage$1 } from "odf.js";
+import { cellReference, columnIndexToLetters, decodePackage as decodePackage$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";
@@ -3808,40 +3808,13 @@ const REPORT_RENDER_TARGET_FORMATS = {
 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$1(new Uint8Array(await readFile(doc.path)));
-	const bytes = renderReportBytes(readOdbReportContent(pkg, { report: options.reportName }), format, fonts, options);
+	const content = readOdbReportContent(pkg, { report: options.reportName });
+	const bytes = format === "docx" ? odbReportToDocx(content) : format === "odt" ? odbReportToOdt(content) : odbReportToPdf(content, toPdfOptions(options, fonts));
 	await writeFile(destinationPath, bytes);
 }
 //#endregion