doculi 3.1.7 → 5.7.10

package/dist/index.cjs

@@ -4,6 +4,7 @@ let node_path = require("node:path");
 let documents_js = require("documents.js");
 let node_fs = require("node:fs");
 let commander = require("commander");
+let document_schema_js = require("document-schema.js");
 let document_outline_js = require("document-outline.js");
 //#region src/format.ts
 const EXTENSION_TO_FORMAT = {
@@ -30,6 +31,12 @@ const EXTENSION_TO_FORMAT = {
 	svg: "svg",
 	markdown: "markdown",
 	md: "markdown",
+	rtf: "rtf",
+	wpd: "wpd",
+	doc: "doc",
+	xls: "xls",
+	ppt: "ppt",
+	epub: "epub",
 	pdf: "pdf"
 };
 const FORMAT_TO_EXTENSION = {
@@ -44,6 +51,12 @@ const FORMAT_TO_EXTENSION = {
 	csv: "csv",
 	svg: "svg",
 	markdown: "md",
+	rtf: "rtf",
+	wpd: "wpd",
+	doc: "doc",
+	xls: "xls",
+	ppt: "ppt",
+	epub: "epub",
 	pdf: "pdf"
 };
 function isDocumentFormat(value) {
@@ -68,9 +81,13 @@ function combineSignals(a, b) {
 		controller.abort(signal.reason);
 	};
 	if (a.aborted) forward(a);
-	else a.addEventListener("abort", () => forward(a), { once: true });
+	else a.addEventListener("abort", () => {
+		forward(a);
+	}, { once: true });
 	if (b.aborted) forward(b);
-	else b.addEventListener("abort", () => forward(b), { once: true });
+	else b.addEventListener("abort", () => {
+		forward(b);
+	}, { once: true });
 	return controller.signal;
 }
 function createRuntimeSignal(options) {
@@ -252,7 +269,7 @@ function resolveDefaultOutputPath(inputPath, targetFormat) {
 }
 //#endregion
 //#region src/commands/shared.ts
-const KNOWN_DOCUMENT_FORMATS = "docx, pptx, xlsx, odt, odp, ods, odg, svg, odf, csv, markdown, pdf";
+const KNOWN_DOCUMENT_FORMATS = "docx, pptx, xlsx, odt, odp, ods, odg, svg, odf, csv, markdown, rtf, wpd, doc, xls, ppt, epub, pdf";
 function resolveTargetFormat(output, out, to) {
 	if (to !== void 0) {
 		if (!isDocumentFormat(to)) return { errorMessage: `unknown --to format '${to}'; expected one of ${KNOWN_DOCUMENT_FORMATS}` };
@@ -281,6 +298,7 @@ function buildConversionAction(source, target) {
 		try {
 			const inputBytes = await readInput(input, { signal });
 			const fonts = await loadProvidedFonts(options.fontFiles ?? [], { signal });
+			const images = createFilesystemMarkdownImageResolver(input === "-" ? "." : (0, node_path.dirname)((0, node_path.resolve)(input)));
 			const result = await (0, documents_js.createLocalDocumentConverter)().convert({
 				source: {
 					format: source,
@@ -295,7 +313,7 @@ function buildConversionAction(source, target) {
 					quiet: options.quiet,
 					command
 				}) : void 0,
-				images: createFilesystemMarkdownImageResolver(input === "-" ? "." : (0, node_path.dirname)((0, node_path.resolve)(input))),
+				images,
 				delimiter: options.delimiter,
 				sheet: options.sheet,
 				page: options.page
@@ -307,8 +325,13 @@ function buildConversionAction(source, target) {
 				command
 			});
 			for (const diagnostic of result.diagnostics) reporter.report(diagnostic);
-			if (options.dumpPackage !== void 0) if (result.package === void 0) process.stderr.write(`[${command}] this conversion does not produce an intermediate DocumentPackage\n`);
-			else await (0, node_fs_promises.writeFile)(options.dumpPackage, JSON.stringify((0, documents_js.documentPackageWithSchema)(result.package), void 0, 2));
+			if (options.dumpPackage !== void 0) {
+				const nativeTree = (0, documents_js.readNativeDocumentTree)(source, new Uint8Array(inputBytes), {
+					signal,
+					images
+				});
+				await (0, node_fs_promises.writeFile)(options.dumpPackage, JSON.stringify((0, documents_js.documentTreeWithSchema)(nativeTree), void 0, 2));
+			}
 			reporter.summarize({
 				output: resolvedOutput,
 				bytes: result.document.bytes.byteLength,
@@ -339,7 +362,7 @@ function addVerboseOption(command) {
 	return command.option("--verbose", "include a full stack trace when the run fails", false);
 }
 function addDumpPackageOption(command) {
-	return command.option("--dump-package <file>", "write the intermediate DocumentPackage (the tree form: container-grouped content carrying per-node rendered frames, plus page sizes) this conversion built to a JSON file");
+	return command.option("--dump-package <file>", "write the intermediate DocumentTree (the tree form: container-grouped content carrying per-node rendered frames, plus page sizes) this conversion built to a JSON file");
 }
 function collectFontFile(value, previous) {
 	return [...previous, value];
@@ -454,9 +477,15 @@ function footnotesSection(footnotes) {
 	if (footnotes.length === 0) return [];
 	return ["footnotes", ...footnotes.map((footnote, index) => footnoteLine(footnote, index + 1))];
 }
-function headerOrFooterSection(label, values) {
-	if (values.length === 0) return [];
-	return [label, ...values.map((text, index) => `${indent$1(1)}[${index + 1}] ${text}`)];
+function partText(blocks) {
+	let text = "";
+	for (const block of blocks) if (block.kind === "paragraph") text += block.runs.map((run) => run.text).join("");
+	else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) text += partText(cell.blocks);
+	return text;
+}
+function headerOrFooterSection(label, parts) {
+	if (parts.length === 0) return [];
+	return [label, ...parts.map((part, index) => `${indent$1(1)}[${index + 1}] ${partText(part.blocks)}`)];
 }
 function numberingLevelLine(ilvl, level) {
 	const restartSuffix = level.restart === void 0 ? "" : `, restarts at level ${level.restart}`;
@@ -483,8 +512,8 @@ function formatDocxExtrasLines(extras) {
 	const nonEmptySections = [
 		commentsSection(extras.comments),
 		footnotesSection(extras.footnotes),
-		headerOrFooterSection("headers", extras.headers),
-		headerOrFooterSection("footers", extras.footers),
+		headerOrFooterSection("headers", extras.headerFooterParts.filter((part) => part.kind === "header")),
+		headerOrFooterSection("footers", extras.headerFooterParts.filter((part) => part.kind === "footer")),
 		numberingSection(extras.numbering)
 	].filter((section) => section.length > 0);
 	if (nonEmptySections.length === 0) return ["This document carries no comments, footnotes, headers, footers, or numbering definitions."];
@@ -580,6 +609,9 @@ function isSchemaVersionMismatchError(error) {
 function isLayoutSchemaDemotedError(error) {
 	return error instanceof Error && error.name === "LayoutSchemaDemotedError";
 }
+function isDocumentPackageRenamedError(error) {
+	return error instanceof Error && error.name === "DocumentPackageRenamedError";
+}
 async function runFromPackage(input, output, options) {
 	const command = "from-package";
 	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
@@ -604,11 +636,11 @@ async function runFromPackage(input, output, options) {
 			return 1;
 		}
 		const result = (0, documents_js.documentFromJson)(parsed);
-		if (result.kind !== "DocumentPackage") {
-			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`);
+		if (result.kind !== "DocumentTree") {
+			process.stderr.write(`[${command}] '${input}' is a ${result.kind}, not a DocumentTree -- only a file written by --dump-package can be read back by this command\n`);
 			return 2;
 		}
-		const content = (0, documents_js.flattenPackage)(result.value);
+		const content = (0, document_schema_js.flattenTree)(result.value);
 		const bytes = target.format === "csv" ? (0, documents_js.encodeCsvText)((0, documents_js.buildCsvText)(content, {
 			delimiter: options.delimiter,
 			sheet: options.sheet
@@ -630,19 +662,23 @@ async function runFromPackage(input, output, options) {
 			return 1;
 		}
 		if (isSchemaVersionMismatchError(error)) {
-			process.stderr.write(`[${command}] '${input}' is a DocumentPackage dump from document-schema.js@${error.dumpVersion}, but this CLI's documents.js reads only @${error.installedVersion}-major dumps -- 4.0.0 replaced the flat { formatVersion, content, pages } shape with the tree-form DocumentPackage (ExaDev/document-schema.js#20); re-run the source conversion with --dump-package to write a current dump\n`);
+			process.stderr.write(`[${command}] '${input}' is a DocumentTree dump from document-schema.js@${error.dumpVersion}, but this CLI's documents.js reads only @${error.installedVersion}-major dumps -- 4.0.0 replaced the flat { formatVersion, content, pages } shape with the tree-form DocumentTree (ExaDev/document-schema.js#20); re-run the source conversion with --dump-package to write a current dump\n`);
 			return 1;
 		}
 		if (isLayoutSchemaDemotedError(error)) {
 			process.stderr.write(`[${command}] '${input}' is a LayoutDocument dump -- LayoutDocument moved to pdf-codec in document-schema.js 4.0.0 and is no longer a schema-stamped input; re-run the source conversion with --dump-package and read that package back instead\n`);
 			return 1;
 		}
+		if (isDocumentPackageRenamedError(error)) {
+			process.stderr.write(`[${command}] '${input}' is a document-package dump -- DocumentPackage was renamed to DocumentTree in document-schema.js 5.0.0 (ExaDev/documents.js#661); re-run the source conversion with --dump-package to write a current tree-form DocumentTree dump\n`);
+			return 1;
+		}
 		process.stderr.write(`${formatError(error, options.verbose)}\n`);
 		return mapErrorToExit(error, getAbortReason());
 	}
 }
 function registerFromPackageCommand(program) {
-	const command = program.command("from-package <input> [output]").description("read a DocumentPackage previously written by --dump-package and export it to a real target format");
+	const command = program.command("from-package <input> [output]").description("read a DocumentTree previously written by --dump-package and export it to a real target format");
 	addOutOption(command);
 	addTimeoutOption(command);
 	addJsonOption(command);
@@ -1290,20 +1326,6 @@ function registerOdmCommand(program) {
 }
 //#endregion
 //#region src/commands/outline.ts
-const OUTLINE_CONVERSION_TARGET = {
-	docx: "odt",
-	odt: "docx",
-	markdown: "docx",
-	pptx: "odp",
-	odp: "pptx",
-	xlsx: "ods",
-	ods: "xlsx",
-	csv: "xlsx",
-	odg: "odp",
-	svg: "odg",
-	pdf: "docx",
-	odf: "pdf"
-};
 const INDENT = "  ";
 function singleLineText(text) {
 	return text.replaceAll(/\s+/g, " ").trim();
@@ -1339,7 +1361,6 @@ async function runOutline(input, options) {
 		process.stderr.write(`[${command}] ${source.errorMessage}\n`);
 		return 2;
 	}
-	const target = OUTLINE_CONVERSION_TARGET[source.format];
 	const { signal, getAbortReason } = createRuntimeSignal({ timeoutMs: options.timeout });
 	const reporter = createDiagnosticReporter({
 		json: options.json,
@@ -1348,19 +1369,14 @@ async function runOutline(input, options) {
 	});
 	try {
 		const inputBytes = await readInput(input, { signal });
-		const result = await (0, documents_js.createLocalDocumentConverter)().convert({
-			source: {
-				format: source.format,
-				bytes: new Uint8Array(inputBytes)
-			},
-			targetFormat: target
-		}, {
+		const tree = (0, documents_js.readNativeDocumentTree)(source.format, new Uint8Array(inputBytes), {
 			signal,
-			images: createFilesystemMarkdownImageResolver(input === "-" ? "." : (0, node_path.dirname)((0, node_path.resolve)(input)))
+			images: createFilesystemMarkdownImageResolver(input === "-" ? "." : (0, node_path.dirname)((0, node_path.resolve)(input))),
+			sink: (diagnostic) => {
+				reporter.report(diagnostic);
+			}
 		});
-		for (const diagnostic of result.diagnostics) reporter.report(diagnostic);
-		if (result.package === void 0) throw new Error(`the ${source.format}-to-${target} conversion produced no intermediate DocumentPackage`);
-		const outline = (0, document_outline_js.buildOutline)(result.package);
+		const outline = (0, document_outline_js.buildOutline)(tree);
 		if (options.json) {
 			process.stdout.write(`${JSON.stringify(outline, void 0, 2)}\n`);
 			return 0;
@@ -1508,11 +1524,11 @@ async function runSetMetadata(input, output, options) {
 function registerSetMetadataCommand(program) {
 	const command = program.command("set-metadata <input> [output]").description("patch a document's own title/author/subject/keywords, leaving every other field and every other flag as-is").addHelpText("after", [
 		"",
-		"Two write paths: a pdf source/target patches the metadata directly on the parsed PDF (writePdf), with no layout engine",
-		"involved at all -- genuinely lossless for everything else on the page. Every other supported format (docx, pptx, odt,",
-		"odp, ods, odg, markdown) rebuilds a fresh package from that format's own ContentDocument -- for docx specifically,",
-		"this is LOSSY: it drops anything docx-extras covers (comments, footnotes, headers/footers, numbering definitions),",
-		"since buildDocxPackage builds a fresh package from the ContentDocument alone, with no way to carry that data through.",
+		"Three write paths: a pdf source/target patches the metadata directly on the parsed PDF (writePdf), and a docx source/target",
+		"patches docProps/core.xml directly on the decoded package -- both with no layout engine or ContentDocument rebuild involved",
+		"at all, so everything else on the page (pdf) or in the package (docx -- comments, footnotes, headers/footers, numbering",
+		"definitions included) survives byte-faithful. Every other supported format (pptx, xlsx, odt, odp, ods, odg, markdown, rtf)",
+		"rebuilds a fresh package from that format's own ContentDocument instead.",
 		"",
 		"set-metadata does not convert format -- source and target must match. Run convert/from-package first, then",
 		"set-metadata on the result, if you need a different target format."
@@ -1533,12 +1549,12 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "3.1.7";
+var version = "5.7.10";
 //#endregion
 //#region src/program.ts
 function createProgram() {
 	const program = new commander.Command("document-cli");
-	program.description("every documents.js docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/csv/svg/markdown conversion, bridge, and inspector as a scriptable command");
+	program.description("every documents.js docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/csv/svg/markdown/rtf conversion, bridge, and inspector as a scriptable command");
 	program.version(version);
 	program.exitOverride((error) => {
 		process.exitCode = error.exitCode === 0 ? 0 : 2;

package/dist/index.d.cts

@@ -32,6 +32,6 @@ declare const EXIT_USAGE_ERROR = 2;
 declare const EXIT_NEEDS_INFO = 3;
 declare const EXIT_TIMEOUT = 124;
 declare const EXIT_INTERRUPTED = 130;
-declare function mapErrorToExit(error: unknown, abortReason: 'interrupt' | 'timeout' | undefined): number;
+declare function mapErrorToExit(error: unknown, abortReason: "interrupt" | "timeout" | undefined): number;
 //#endregion
 export { type ConversionCommandOptions, EXIT_INPUT_ERROR, EXIT_INTERRUPTED, EXIT_NEEDS_INFO, EXIT_SUCCESS, EXIT_TIMEOUT, EXIT_USAGE_ERROR, buildConversionAction, createProgram, formatError, formatToExtension, inferFormatFromExtension, isDocumentFormat, mapErrorToExit };

package/dist/index.d.ts

@@ -32,6 +32,6 @@ declare const EXIT_USAGE_ERROR = 2;
 declare const EXIT_NEEDS_INFO = 3;
 declare const EXIT_TIMEOUT = 124;
 declare const EXIT_INTERRUPTED = 130;
-declare function mapErrorToExit(error: unknown, abortReason: 'interrupt' | 'timeout' | undefined): number;
+declare function mapErrorToExit(error: unknown, abortReason: "interrupt" | "timeout" | undefined): number;
 //#endregion
 export { type ConversionCommandOptions, EXIT_INPUT_ERROR, EXIT_INTERRUPTED, EXIT_NEEDS_INFO, EXIT_SUCCESS, EXIT_TIMEOUT, EXIT_USAGE_ERROR, buildConversionAction, createProgram, formatError, formatToExtension, inferFormatFromExtension, isDocumentFormat, mapErrorToExit };

package/dist/index.js

@@ -1,8 +1,9 @@
 import { readFile, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, join, resolve } from "node:path";
-import { CsvSheetNotFoundError, CsvSheetNotSpecifiedError, HsqldbSqlEvaluationError, HsqldbSqlParseError, HsqldbSqlUnsupportedError, OdbNoEmbeddedDataSourceError, OdbReportNotSpecifiedError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, SvgMultiPageNotSpecifiedError, SvgPageNotFoundError, UnrecognizedDocumentSchemaError, UnsupportedFontSourceFormatError, buildCsvText, buildDocumentBytes, buildSvgText, createLocalDocumentConverter, decodeOdbPackage, decodePackage, describeFontFace, documentFromJson, documentPackageWithSchema, encodeCsvText, encodeSvgText, evaluateSelect, extractSourceFontsForFormat, flattenPackage, hsqldbCellDisplayText, odbReportToDocx, odbReportToOdt, odbReportToPdf, odbToCsv, odbToXlsx, odmToPdf, parseSelect, readDocumentMetadata, readDocxExtras, readOdbForms, readOdbInventory, readOdbReportContent, readOdbReports, readOdbTables, readPdf, setDocumentMetadata } from "documents.js";
+import { CsvSheetNotFoundError, CsvSheetNotSpecifiedError, HsqldbSqlEvaluationError, HsqldbSqlParseError, HsqldbSqlUnsupportedError, OdbNoEmbeddedDataSourceError, OdbReportNotSpecifiedError, OdbTableNotFoundError, OdbTableNotSpecifiedError, OdbUnsupportedFormatError, OdmUnresolvedSectionError, PdfEncryptedError, PdfParseError, SvgMultiPageNotSpecifiedError, SvgPageNotFoundError, UnrecognizedDocumentSchemaError, UnsupportedFontSourceFormatError, buildCsvText, buildDocumentBytes, buildSvgText, createLocalDocumentConverter, decodeOdbPackage, decodePackage, describeFontFace, documentFromJson, documentTreeWithSchema, encodeCsvText, encodeSvgText, evaluateSelect, extractSourceFontsForFormat, hsqldbCellDisplayText, odbReportToDocx, odbReportToOdt, odbReportToPdf, odbToCsv, odbToXlsx, odmToPdf, parseSelect, readDocumentMetadata, readDocxExtras, readNativeDocumentTree, readOdbForms, readOdbInventory, readOdbReportContent, readOdbReports, readOdbTables, readPdf, setDocumentMetadata } from "documents.js";
 import { existsSync, readFileSync } from "node:fs";
 import { Command, InvalidArgumentError } from "commander";
+import { flattenTree } from "document-schema.js";
 import { buildOutline, isOutlineNode, outlineLeafText } from "document-outline.js";
 //#region src/format.ts
 const EXTENSION_TO_FORMAT = {
@@ -29,6 +30,12 @@ const EXTENSION_TO_FORMAT = {
 	svg: "svg",
 	markdown: "markdown",
 	md: "markdown",
+	rtf: "rtf",
+	wpd: "wpd",
+	doc: "doc",
+	xls: "xls",
+	ppt: "ppt",
+	epub: "epub",
 	pdf: "pdf"
 };
 const FORMAT_TO_EXTENSION = {
@@ -43,6 +50,12 @@ const FORMAT_TO_EXTENSION = {
 	csv: "csv",
 	svg: "svg",
 	markdown: "md",
+	rtf: "rtf",
+	wpd: "wpd",
+	doc: "doc",
+	xls: "xls",
+	ppt: "ppt",
+	epub: "epub",
 	pdf: "pdf"
 };
 function isDocumentFormat(value) {
@@ -67,9 +80,13 @@ function combineSignals(a, b) {
 		controller.abort(signal.reason);
 	};
 	if (a.aborted) forward(a);
-	else a.addEventListener("abort", () => forward(a), { once: true });
+	else a.addEventListener("abort", () => {
+		forward(a);
+	}, { once: true });
 	if (b.aborted) forward(b);
-	else b.addEventListener("abort", () => forward(b), { once: true });
+	else b.addEventListener("abort", () => {
+		forward(b);
+	}, { once: true });
 	return controller.signal;
 }
 function createRuntimeSignal(options) {
@@ -251,7 +268,7 @@ function resolveDefaultOutputPath(inputPath, targetFormat) {
 }
 //#endregion
 //#region src/commands/shared.ts
-const KNOWN_DOCUMENT_FORMATS = "docx, pptx, xlsx, odt, odp, ods, odg, svg, odf, csv, markdown, pdf";
+const KNOWN_DOCUMENT_FORMATS = "docx, pptx, xlsx, odt, odp, ods, odg, svg, odf, csv, markdown, rtf, wpd, doc, xls, ppt, epub, pdf";
 function resolveTargetFormat(output, out, to) {
 	if (to !== void 0) {
 		if (!isDocumentFormat(to)) return { errorMessage: `unknown --to format '${to}'; expected one of ${KNOWN_DOCUMENT_FORMATS}` };
@@ -280,6 +297,7 @@ function buildConversionAction(source, target) {
 		try {
 			const inputBytes = await readInput(input, { signal });
 			const fonts = await loadProvidedFonts(options.fontFiles ?? [], { signal });
+			const images = createFilesystemMarkdownImageResolver(input === "-" ? "." : dirname(resolve(input)));
 			const result = await createLocalDocumentConverter().convert({
 				source: {
 					format: source,
@@ -294,7 +312,7 @@ function buildConversionAction(source, target) {
 					quiet: options.quiet,
 					command
 				}) : void 0,
-				images: createFilesystemMarkdownImageResolver(input === "-" ? "." : dirname(resolve(input))),
+				images,
 				delimiter: options.delimiter,
 				sheet: options.sheet,
 				page: options.page
@@ -306,8 +324,13 @@ function buildConversionAction(source, target) {
 				command
 			});
 			for (const diagnostic of result.diagnostics) reporter.report(diagnostic);
-			if (options.dumpPackage !== void 0) if (result.package === void 0) process.stderr.write(`[${command}] this conversion does not produce an intermediate DocumentPackage\n`);
-			else await writeFile(options.dumpPackage, JSON.stringify(documentPackageWithSchema(result.package), void 0, 2));
+			if (options.dumpPackage !== void 0) {
+				const nativeTree = readNativeDocumentTree(source, new Uint8Array(inputBytes), {
+					signal,
+					images
+				});
+				await writeFile(options.dumpPackage, JSON.stringify(documentTreeWithSchema(nativeTree), void 0, 2));
+			}
 			reporter.summarize({
 				output: resolvedOutput,
 				bytes: result.document.bytes.byteLength,
@@ -338,7 +361,7 @@ function addVerboseOption(command) {
 	return command.option("--verbose", "include a full stack trace when the run fails", false);
 }
 function addDumpPackageOption(command) {
-	return command.option("--dump-package <file>", "write the intermediate DocumentPackage (the tree form: container-grouped content carrying per-node rendered frames, plus page sizes) this conversion built to a JSON file");
+	return command.option("--dump-package <file>", "write the intermediate DocumentTree (the tree form: container-grouped content carrying per-node rendered frames, plus page sizes) this conversion built to a JSON file");
 }
 function collectFontFile(value, previous) {
 	return [...previous, value];
@@ -453,9 +476,15 @@ function footnotesSection(footnotes) {
 	if (footnotes.length === 0) return [];
 	return ["footnotes", ...footnotes.map((footnote, index) => footnoteLine(footnote, index + 1))];
 }
-function headerOrFooterSection(label, values) {
-	if (values.length === 0) return [];
-	return [label, ...values.map((text, index) => `${indent$1(1)}[${index + 1}] ${text}`)];
+function partText(blocks) {
+	let text = "";
+	for (const block of blocks) if (block.kind === "paragraph") text += block.runs.map((run) => run.text).join("");
+	else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) text += partText(cell.blocks);
+	return text;
+}
+function headerOrFooterSection(label, parts) {
+	if (parts.length === 0) return [];
+	return [label, ...parts.map((part, index) => `${indent$1(1)}[${index + 1}] ${partText(part.blocks)}`)];
 }
 function numberingLevelLine(ilvl, level) {
 	const restartSuffix = level.restart === void 0 ? "" : `, restarts at level ${level.restart}`;
@@ -482,8 +511,8 @@ function formatDocxExtrasLines(extras) {
 	const nonEmptySections = [
 		commentsSection(extras.comments),
 		footnotesSection(extras.footnotes),
-		headerOrFooterSection("headers", extras.headers),
-		headerOrFooterSection("footers", extras.footers),
+		headerOrFooterSection("headers", extras.headerFooterParts.filter((part) => part.kind === "header")),
+		headerOrFooterSection("footers", extras.headerFooterParts.filter((part) => part.kind === "footer")),
 		numberingSection(extras.numbering)
 	].filter((section) => section.length > 0);
 	if (nonEmptySections.length === 0) return ["This document carries no comments, footnotes, headers, footers, or numbering definitions."];
@@ -579,6 +608,9 @@ function isSchemaVersionMismatchError(error) {
 function isLayoutSchemaDemotedError(error) {
 	return error instanceof Error && error.name === "LayoutSchemaDemotedError";
 }
+function isDocumentPackageRenamedError(error) {
+	return error instanceof Error && error.name === "DocumentPackageRenamedError";
+}
 async function runFromPackage(input, output, options) {
 	const command = "from-package";
 	if (output !== void 0 && options.out !== void 0 && output !== options.out) {
@@ -603,11 +635,11 @@ async function runFromPackage(input, output, options) {
 			return 1;
 		}
 		const result = documentFromJson(parsed);
-		if (result.kind !== "DocumentPackage") {
-			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`);
+		if (result.kind !== "DocumentTree") {
+			process.stderr.write(`[${command}] '${input}' is a ${result.kind}, not a DocumentTree -- only a file written by --dump-package can be read back by this command\n`);
 			return 2;
 		}
-		const content = flattenPackage(result.value);
+		const content = flattenTree(result.value);
 		const bytes = target.format === "csv" ? encodeCsvText(buildCsvText(content, {
 			delimiter: options.delimiter,
 			sheet: options.sheet
@@ -629,19 +661,23 @@ async function runFromPackage(input, output, options) {
 			return 1;
 		}
 		if (isSchemaVersionMismatchError(error)) {
-			process.stderr.write(`[${command}] '${input}' is a DocumentPackage dump from document-schema.js@${error.dumpVersion}, but this CLI's documents.js reads only @${error.installedVersion}-major dumps -- 4.0.0 replaced the flat { formatVersion, content, pages } shape with the tree-form DocumentPackage (ExaDev/document-schema.js#20); re-run the source conversion with --dump-package to write a current dump\n`);
+			process.stderr.write(`[${command}] '${input}' is a DocumentTree dump from document-schema.js@${error.dumpVersion}, but this CLI's documents.js reads only @${error.installedVersion}-major dumps -- 4.0.0 replaced the flat { formatVersion, content, pages } shape with the tree-form DocumentTree (ExaDev/document-schema.js#20); re-run the source conversion with --dump-package to write a current dump\n`);
 			return 1;
 		}
 		if (isLayoutSchemaDemotedError(error)) {
 			process.stderr.write(`[${command}] '${input}' is a LayoutDocument dump -- LayoutDocument moved to pdf-codec in document-schema.js 4.0.0 and is no longer a schema-stamped input; re-run the source conversion with --dump-package and read that package back instead\n`);
 			return 1;
 		}
+		if (isDocumentPackageRenamedError(error)) {
+			process.stderr.write(`[${command}] '${input}' is a document-package dump -- DocumentPackage was renamed to DocumentTree in document-schema.js 5.0.0 (ExaDev/documents.js#661); re-run the source conversion with --dump-package to write a current tree-form DocumentTree dump\n`);
+			return 1;
+		}
 		process.stderr.write(`${formatError(error, options.verbose)}\n`);
 		return mapErrorToExit(error, getAbortReason());
 	}
 }
 function registerFromPackageCommand(program) {
-	const command = program.command("from-package <input> [output]").description("read a DocumentPackage previously written by --dump-package and export it to a real target format");
+	const command = program.command("from-package <input> [output]").description("read a DocumentTree previously written by --dump-package and export it to a real target format");
 	addOutOption(command);
 	addTimeoutOption(command);
 	addJsonOption(command);
@@ -1289,20 +1325,6 @@ function registerOdmCommand(program) {
 }
 //#endregion
 //#region src/commands/outline.ts
-const OUTLINE_CONVERSION_TARGET = {
-	docx: "odt",
-	odt: "docx",
-	markdown: "docx",
-	pptx: "odp",
-	odp: "pptx",
-	xlsx: "ods",
-	ods: "xlsx",
-	csv: "xlsx",
-	odg: "odp",
-	svg: "odg",
-	pdf: "docx",
-	odf: "pdf"
-};
 const INDENT = "  ";
 function singleLineText(text) {
 	return text.replaceAll(/\s+/g, " ").trim();
@@ -1338,7 +1360,6 @@ async function runOutline(input, options) {
 		process.stderr.write(`[${command}] ${source.errorMessage}\n`);
 		return 2;
 	}
-	const target = OUTLINE_CONVERSION_TARGET[source.format];
 	const { signal, getAbortReason } = createRuntimeSignal({ timeoutMs: options.timeout });
 	const reporter = createDiagnosticReporter({
 		json: options.json,
@@ -1347,19 +1368,14 @@ async function runOutline(input, options) {
 	});
 	try {
 		const inputBytes = await readInput(input, { signal });
-		const result = await createLocalDocumentConverter().convert({
-			source: {
-				format: source.format,
-				bytes: new Uint8Array(inputBytes)
-			},
-			targetFormat: target
-		}, {
+		const tree = readNativeDocumentTree(source.format, new Uint8Array(inputBytes), {
 			signal,
-			images: createFilesystemMarkdownImageResolver(input === "-" ? "." : dirname(resolve(input)))
+			images: createFilesystemMarkdownImageResolver(input === "-" ? "." : dirname(resolve(input))),
+			sink: (diagnostic) => {
+				reporter.report(diagnostic);
+			}
 		});
-		for (const diagnostic of result.diagnostics) reporter.report(diagnostic);
-		if (result.package === void 0) throw new Error(`the ${source.format}-to-${target} conversion produced no intermediate DocumentPackage`);
-		const outline = buildOutline(result.package);
+		const outline = buildOutline(tree);
 		if (options.json) {
 			process.stdout.write(`${JSON.stringify(outline, void 0, 2)}\n`);
 			return 0;
@@ -1507,11 +1523,11 @@ async function runSetMetadata(input, output, options) {
 function registerSetMetadataCommand(program) {
 	const command = program.command("set-metadata <input> [output]").description("patch a document's own title/author/subject/keywords, leaving every other field and every other flag as-is").addHelpText("after", [
 		"",
-		"Two write paths: a pdf source/target patches the metadata directly on the parsed PDF (writePdf), with no layout engine",
-		"involved at all -- genuinely lossless for everything else on the page. Every other supported format (docx, pptx, odt,",
-		"odp, ods, odg, markdown) rebuilds a fresh package from that format's own ContentDocument -- for docx specifically,",
-		"this is LOSSY: it drops anything docx-extras covers (comments, footnotes, headers/footers, numbering definitions),",
-		"since buildDocxPackage builds a fresh package from the ContentDocument alone, with no way to carry that data through.",
+		"Three write paths: a pdf source/target patches the metadata directly on the parsed PDF (writePdf), and a docx source/target",
+		"patches docProps/core.xml directly on the decoded package -- both with no layout engine or ContentDocument rebuild involved",
+		"at all, so everything else on the page (pdf) or in the package (docx -- comments, footnotes, headers/footers, numbering",
+		"definitions included) survives byte-faithful. Every other supported format (pptx, xlsx, odt, odp, ods, odg, markdown, rtf)",
+		"rebuilds a fresh package from that format's own ContentDocument instead.",
 		"",
 		"set-metadata does not convert format -- source and target must match. Run convert/from-package first, then",
 		"set-metadata on the result, if you need a different target format."
@@ -1532,12 +1548,12 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "3.1.7";
+var version = "5.7.10";
 //#endregion
 //#region src/program.ts
 function createProgram() {
 	const program = new Command("document-cli");
-	program.description("every documents.js docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/csv/svg/markdown conversion, bridge, and inspector as a scriptable command");
+	program.description("every documents.js docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/csv/svg/markdown/rtf conversion, bridge, and inspector as a scriptable command");
 	program.version(version);
 	program.exitOverride((error) => {
 		process.exitCode = error.exitCode === 0 ? 0 : 2;

package/dist/{odb-structure-B1ygPCEa.js → odb-structure-CItnH50p.js}

@@ -26,6 +26,12 @@ const EXTENSION_TO_FORMAT = {
 	svg: "svg",
 	markdown: "markdown",
 	md: "markdown",
+	rtf: "rtf",
+	wpd: "wpd",
+	doc: "doc",
+	xls: "xls",
+	ppt: "ppt",
+	epub: "epub",
 	pdf: "pdf"
 };
 const FORMAT_TO_EXTENSION = {
@@ -40,6 +46,12 @@ const FORMAT_TO_EXTENSION = {
 	csv: "csv",
 	svg: "svg",
 	markdown: "md",
+	rtf: "rtf",
+	wpd: "wpd",
+	doc: "doc",
+	xls: "xls",
+	ppt: "ppt",
+	epub: "epub",
 	pdf: "pdf"
 };
 function isDocumentFormat(value) {
@@ -133,9 +145,15 @@ function footnotesSection(footnotes) {
 	if (footnotes.length === 0) return [];
 	return ["footnotes", ...footnotes.map((footnote, index) => footnoteLine(footnote, index + 1))];
 }
-function headerOrFooterSection(label, values) {
-	if (values.length === 0) return [];
-	return [label, ...values.map((text, index) => `${indent$1(1)}[${index + 1}] ${text}`)];
+function partText(blocks) {
+	let text = "";
+	for (const block of blocks) if (block.kind === "paragraph") text += block.runs.map((run) => run.text).join("");
+	else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) text += partText(cell.blocks);
+	return text;
+}
+function headerOrFooterSection(label, parts) {
+	if (parts.length === 0) return [];
+	return [label, ...parts.map((part, index) => `${indent$1(1)}[${index + 1}] ${partText(part.blocks)}`)];
 }
 function numberingLevelLine(ilvl, level) {
 	const restartSuffix = level.restart === void 0 ? "" : `, restarts at level ${level.restart}`;
@@ -162,8 +180,8 @@ function formatDocxExtrasLines(extras) {
 	const nonEmptySections = [
 		commentsSection(extras.comments),
 		footnotesSection(extras.footnotes),
-		headerOrFooterSection("headers", extras.headers),
-		headerOrFooterSection("footers", extras.footers),
+		headerOrFooterSection("headers", extras.headerFooterParts.filter((part) => part.kind === "header")),
+		headerOrFooterSection("footers", extras.headerFooterParts.filter((part) => part.kind === "footer")),
 		numberingSection(extras.numbering)
 	].filter((section) => section.length > 0);
 	if (nonEmptySections.length === 0) return ["This document carries no comments, footnotes, headers, footers, or numbering definitions."];
@@ -326,4 +344,4 @@ function formatOdbReportLines(report) {
 	return lines;
 }
 //#endregion
-export { odbFormSummary as a, formatDocxExtrasLines as c, writeOutput as d, loadProvidedFonts as f, isDocumentFormat as h, formatOdbReportLines as i, readInput as l, inferFormatFromExtension as m, describeOdbReport as n, formatMetadataLines as o, formatToExtension as p, formatOdbFormLines as r, presentMetadataEntries as s, describeOdbForm as t, resolveDefaultOutputPath as u };
+export { odbFormSummary as a, presentMetadataEntries as c, resolveDefaultOutputPath as d, writeOutput as f, isDocumentFormat as g, inferFormatFromExtension as h, formatOdbReportLines as i, formatDocxExtrasLines as l, formatToExtension as m, describeOdbReport as n, formatMetadataLines as o, loadProvidedFonts as p, formatOdbFormLines as r, formatMetadataValue as s, describeOdbForm as t, readInput as u };