document-cli 2.1.5 → 3.0.0

package/README.md

@@ -95,7 +95,7 @@ document-cli convert report.docx - --to pdf > report.pdf
 
 **`formats`** — lists every `source -> target` pair the commands above support (`--json` for a machine-readable array), plus a pointer to the commands not on that list because they don't fit the source/target shape (`odm-to-pdf`, `odb-to-csv`, `odb-to-xlsx`, `odb-tables`, `odb-forms`, `odb-reports`, `pdf-inspect`, `from-package`, `fonts`, `docx-extras`, `metadata`, `set-metadata`).
 
-**`from-package <input> [output]`** — reads back a `DocumentPackage` JSON file a previous conversion wrote via `--dump-package` (below) and exports it to a real target format, closing the round trip `--dump-package` otherwise has no return path for. Target resolution matches `convert`: an output path's own extension, or `--to <format>` when it doesn't have one. `pdf` rebuilds the layout from the package's own recorded positions — each content node's `frames` plus the package's `pages` geometry (`layoutDocumentFromPackage` → `writePdf`; a package no longer carries a separate `layout` half at all); every other format builds a fresh package from the `content` half through the identical `buildXPackage` function the matching `pdf-to-X`/bridge conversion already uses — `xlsx` included, via `ooxml.js`'s own `buildXlsxPackage`. `odf` is the one target rejected outright, since a standalone formula document has no write path from `ContentDocument` at all; a `csv` or `svg` target is written through the identical `buildCsvText`/`buildSvgText` functions the codec registry's own write wrappers call, so the `--delimiter`/`--sheet`/`--page` selection flags below reach it exactly as they do a live conversion. Only a file genuinely written by a current `--dump-package` round-trips here; anything else fails with its `$schema` mismatch named, and a dump from the documents.js 1.x `formatVersion` 1 shape (content plus a separate `layout` half) is rejected with an error naming the version change rather than silently accepted:
+**`from-package <input> [output]`** — reads back a `DocumentPackage` JSON file a previous conversion wrote via `--dump-package` (below) and exports it to a real target format, closing the round trip `--dump-package` otherwise has no return path for. Target resolution matches `convert`: an output path's own extension, or `--to <format>` when it doesn't have one. The package this command reads is the tree form since documents.js 3.0.0 — content grouped one group per container (section, slide, sheet, draw page) under `children`, with the minted `styles` table at the root — flattened once at this boundary, exactly as documents.js's own builders do. `pdf` rebuilds the layout from the package's own recorded positions — each content node's `frames` plus the package's `pages` geometry (`layoutDocumentFromPackage` → `writePdf`; a package no longer carries a separate `layout` half at all); every other format builds a fresh package from the flattened content through the identical `buildXPackage` function the matching `pdf-to-X`/bridge conversion already uses — `xlsx` included, via `ooxml.js`'s own `buildXlsxPackage`. `odf` is the one target rejected outright, since a standalone formula document has no write path from `ContentDocument` at all; a `csv` or `svg` target is written through the identical `buildCsvText`/`buildSvgText` functions the codec registry's own write wrappers call, so the `--delimiter`/`--sheet`/`--page` selection flags below reach it exactly as they do a live conversion. Only a file genuinely written by a current `--dump-package` round-trips here: the `$schema` URI a dump carries pins the document-schema.js release that wrote it, and any pre-4.0.0 dump — the flat `{ formatVersion, content, pages }` envelope documents.js 1.x/2.x wrote, whatever its `formatVersion` — is rejected with an error naming the pinned release, the flat-to-tree change, and the remedy, rather than a raw validation wall. A layout-document dump (a document-schema.js 3.x layout artefact, e.g. an old `pdf-inspect --full` output) gets its own pointer: that schema moved to pdf-codec.
 
 ```sh
 document-cli docx-to-pdf report.docx report.pdf --dump-package report.package.json
@@ -132,7 +132,7 @@ document-cli odb-query sales.odb --query HighValueSales --json
 document-cli odb-render-report sales.odb SalesByRegion.pdf --report SalesByRegion
 ```
 
-**`pdf-inspect <input>`** — reports a PDF's page count, per-page size and item-kind histogram, document metadata, and embedded image formats, without converting it to anything. `--full` dumps the entire parsed `LayoutDocument` as JSON instead of the summary:
+**`pdf-inspect <input>`** — reports a PDF's page count, per-page size and item-kind histogram, document metadata, and embedded image formats, without converting it to anything. `--full` dumps the entire parsed `LayoutDocument` as plain JSON (no `$schema` stamp — that family moved to pdf-codec at document-schema.js 4.0.0 and lost its schema-stamped envelope) instead of the summary:
 
 ```sh
 document-cli pdf-inspect report.pdf
@@ -180,7 +180,7 @@ The explicit conversions, `convert`, `odm-to-pdf`, `odb-to-xlsx`, `odb-to-csv`,
 
 Three further flags select what a csv or svg edge of a conversion works on, threaded straight into documents.js's own `ConversionOptions`: `--delimiter <char>` (the field delimiter a csv source reads with, or a csv target writes with — default `,`), `--sheet <name>` (the sheet a csv target writes, required when the source document has more than one), and `--page <index>` (the 0-based page an svg target draws, required when the source document has more than one). On the explicit commands they are registered only where the pair can reach the edge in question — `--delimiter` on any pair with a csv edge, `--sheet` on a csv target, `--page` on an svg target — and unconditionally on `convert` and `from-package`, whose target is only known once the output path or `--to` resolves at run time (the same registration reasoning the font flags below document). Leaving `--sheet` or `--page` unanswered on an ambiguous document fails with exit `3`, naming the sheets or page count to pick from:
 
-`--dump-package <file>` is one flag further, registered only on the explicit conversions and `convert` — it writes the intermediate `DocumentPackage` (content carrying its own per-node rendered `frames`, plus the `pages` geometry those frames index into) that conversion built to a JSON file, tagged with its own `$schema` so `from-package` (above) can read it back in. Every conversion populates one, `odf-to-pdf` included — its dump carries a `formula`-kind content and the one A4 page it renders (the formula's glyphs travel through the PDF writer's own positioned-formula channel rather than as frame-stamped page content); every PDF-bypassing bridge (`ods-to-xlsx`, `docx-to-pptx`, `odg-to-svg`, and every other content-format pair above) populates one too, just with `pages` always absent, since a bridge never runs a layout engine. `odm-to-pdf`/`odb-*`/`set-metadata` don't expose the flag at all, since none of them goes through `DocumentConverter.convert` in the first place. `odb-tables`, `odb-forms`, `odb-reports`, `fonts`, `docx-extras`, `metadata`, `formats`, and `pdf-inspect` each take only their own `--json` (plus `pdf-inspect`'s own `--full`); `odb-query` takes `--sql <text>`/`--query <savedName>` (mutually exclusive) alongside its own `--json`, with none of the shared flags above since it only reads and writes nothing; `from-package` and `set-metadata` each take `--to <format>` alongside the shared flags in this table; `odb-render-report` takes `--report <name>` and `--to <format>` alongside the shared flags and the font flags below; `tui` takes no flags at all, only an optional positional file.
+`--dump-package <file>` is one flag further, registered only on the explicit conversions and `convert` — it writes the intermediate `DocumentPackage` (the tree form: content grouped one group per container, the content nodes carrying their own rendered `frames`, plus the `pages` geometry those frames index into and the minted `styles` table at the root) that conversion built to a JSON file, tagged with its own version-pinned `$schema` — the URI *is* the package's version — so `from-package` (above) can read it back in. Every conversion populates one, `odf-to-pdf` included — its dump carries a `formula`-kind content and the one A4 page it renders (the formula's glyphs travel through the PDF writer's own positioned-formula channel rather than as frame-stamped page content); every PDF-bypassing bridge (`ods-to-xlsx`, `docx-to-pptx`, `odg-to-svg`, and every other content-format pair above) populates one too, just with `pages` always absent, since a bridge never runs a layout engine. `odm-to-pdf`/`odb-*`/`set-metadata` don't expose the flag at all, since none of them goes through `DocumentConverter.convert` in the first place. `odb-tables`, `odb-forms`, `odb-reports`, `fonts`, `docx-extras`, `metadata`, `formats`, and `pdf-inspect` each take only their own `--json` (plus `pdf-inspect`'s own `--full`); `odb-query` takes `--sql <text>`/`--query <savedName>` (mutually exclusive) alongside its own `--json`, with none of the shared flags above since it only reads and writes nothing; `from-package` and `set-metadata` each take `--to <format>` alongside the shared flags in this table; `odb-render-report` takes `--report <name>` and `--to <format>` alongside the shared flags and the font flags below; `tui` takes no flags at all, only an optional positional file.
 
 ### Real fonts
 

package/dist/cli.js

@@ -3,7 +3,7 @@ import { a as odbFormSummary, c as formatDocxExtrasLines, d as writeOutput, f as
 import { Command, CommanderError, InvalidArgumentError } from "commander";
 import { 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, documentFromJson, documentPackageWithSchema, documentSchemaKindOf, encodeCsvText, encodeSvgText, evaluateSelect, extractSourceFontsForFormat, hsqldbCellDisplayText, layoutDocumentWithSchema, 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, 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 { existsSync, readFileSync } from "node:fs";
 //#region src/runtime/abort.ts
 function combineSignals(a, b) {
@@ -220,7 +220,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 (content with its per-node layout frames + page sizes) this conversion built to a JSON file");
+	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");
 }
 function collectFontFile(value, previous) {
 	return [...previous, value];
@@ -395,10 +395,13 @@ function registerFormatsCommand(program) {
 }
 //#endregion
 //#region src/commands/from-package.ts
-function isFormatVersionOneRecord(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	if (!("formatVersion" in value)) return false;
-	return value.formatVersion === 1;
+function isSchemaVersionMismatchError(error) {
+	if (!(error instanceof Error)) return false;
+	if (error.name !== "SchemaVersionMismatchError") return false;
+	return "dumpVersion" in error && "installedVersion" in error;
+}
+function isLayoutSchemaDemotedError(error) {
+	return error instanceof Error && error.name === "LayoutSchemaDemotedError";
 }
 async function runFromPackage(input, output, options) {
 	const command = "from-package";
@@ -423,19 +426,16 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' is not valid JSON: ${error instanceof Error ? error.message : String(error)}\n`);
 			return 1;
 		}
-		if (documentSchemaKindOf(parsed) === "DocumentPackage" && isFormatVersionOneRecord(parsed)) {
-			process.stderr.write(`[${command}] '${input}' is a DocumentPackage dump at formatVersion 1 (the documents.js 1.x shape: content plus a separate layout half) -- documents.js 2.0.0 replaced it with formatVersion 2 (content carrying its own rendered frames, plus page sizes); re-run the source conversion with --dump-package to write a current dump\n`);
-			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`);
 			return 2;
 		}
-		const bytes = target.format === "csv" ? encodeCsvText(buildCsvText(result.value.content, {
+		const content = flattenPackage(result.value);
+		const bytes = target.format === "csv" ? encodeCsvText(buildCsvText(content, {
 			delimiter: options.delimiter,
 			sheet: options.sheet
-		})) : target.format === "svg" ? encodeSvgText(buildSvgText(result.value.content, { page: options.page })) : buildDocumentBytes(result.value, target.format);
+		})) : target.format === "svg" ? encodeSvgText(buildSvgText(content, { page: options.page })) : buildDocumentBytes(result.value, target.format);
 		await writeOutput(resolvedOutput, bytes);
 		createDiagnosticReporter({
 			json: options.json,
@@ -452,6 +452,14 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' has no recognised $schema -- only a file written by --dump-package can be read back by this command\n`);
 			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`);
+			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;
+		}
 		process.stderr.write(`${formatError(error, options.verbose)}\n`);
 		return mapErrorToExit(error, getAbortReason());
 	}
@@ -976,7 +984,7 @@ async function runPdfInspect(input, options) {
 			}
 		});
 		if (options.full) {
-			process.stdout.write(`${JSON.stringify(layoutDocumentWithSchema(layout), void 0, 2)}\n`);
+			process.stdout.write(`${JSON.stringify(layout, void 0, 2)}\n`);
 			return 0;
 		}
 		const imagesByFormat = countImagesByFormat(layout.images);
@@ -1095,7 +1103,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "2.1.5";
+var version = "3.0.0";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/index.cjs

@@ -338,7 +338,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 (content with its per-node layout frames + page sizes) this conversion built to a JSON file");
+	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");
 }
 function collectFontFile(value, previous) {
 	return [...previous, value];
@@ -571,10 +571,13 @@ function registerFormatsCommand(program) {
 }
 //#endregion
 //#region src/commands/from-package.ts
-function isFormatVersionOneRecord(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	if (!("formatVersion" in value)) return false;
-	return value.formatVersion === 1;
+function isSchemaVersionMismatchError(error) {
+	if (!(error instanceof Error)) return false;
+	if (error.name !== "SchemaVersionMismatchError") return false;
+	return "dumpVersion" in error && "installedVersion" in error;
+}
+function isLayoutSchemaDemotedError(error) {
+	return error instanceof Error && error.name === "LayoutSchemaDemotedError";
 }
 async function runFromPackage(input, output, options) {
 	const command = "from-package";
@@ -599,19 +602,16 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' is not valid JSON: ${error instanceof Error ? error.message : String(error)}\n`);
 			return 1;
 		}
-		if ((0, documents_js.documentSchemaKindOf)(parsed) === "DocumentPackage" && isFormatVersionOneRecord(parsed)) {
-			process.stderr.write(`[${command}] '${input}' is a DocumentPackage dump at formatVersion 1 (the documents.js 1.x shape: content plus a separate layout half) -- documents.js 2.0.0 replaced it with formatVersion 2 (content carrying its own rendered frames, plus page sizes); re-run the source conversion with --dump-package to write a current dump\n`);
-			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`);
 			return 2;
 		}
-		const bytes = target.format === "csv" ? (0, documents_js.encodeCsvText)((0, documents_js.buildCsvText)(result.value.content, {
+		const content = (0, documents_js.flattenPackage)(result.value);
+		const bytes = target.format === "csv" ? (0, documents_js.encodeCsvText)((0, documents_js.buildCsvText)(content, {
 			delimiter: options.delimiter,
 			sheet: options.sheet
-		})) : target.format === "svg" ? (0, documents_js.encodeSvgText)((0, documents_js.buildSvgText)(result.value.content, { page: options.page })) : (0, documents_js.buildDocumentBytes)(result.value, target.format);
+		})) : target.format === "svg" ? (0, documents_js.encodeSvgText)((0, documents_js.buildSvgText)(content, { page: options.page })) : (0, documents_js.buildDocumentBytes)(result.value, target.format);
 		await writeOutput(resolvedOutput, bytes);
 		createDiagnosticReporter({
 			json: options.json,
@@ -628,6 +628,14 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' has no recognised $schema -- only a file written by --dump-package can be read back by this command\n`);
 			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`);
+			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;
+		}
 		process.stderr.write(`${formatError(error, options.verbose)}\n`);
 		return mapErrorToExit(error, getAbortReason());
 	}
@@ -1308,7 +1316,7 @@ async function runPdfInspect(input, options) {
 			}
 		});
 		if (options.full) {
-			process.stdout.write(`${JSON.stringify((0, documents_js.layoutDocumentWithSchema)(layout), void 0, 2)}\n`);
+			process.stdout.write(`${JSON.stringify(layout, void 0, 2)}\n`);
 			return 0;
 		}
 		const imagesByFormat = countImagesByFormat(layout.images);
@@ -1427,7 +1435,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "2.1.5";
+var version = "3.0.0";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/dist/index.js

@@ -1,6 +1,6 @@
 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, documentSchemaKindOf, encodeCsvText, encodeSvgText, evaluateSelect, extractSourceFontsForFormat, hsqldbCellDisplayText, layoutDocumentWithSchema, 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, 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 { existsSync, readFileSync } from "node:fs";
 import { Command, InvalidArgumentError } from "commander";
 //#region src/format.ts
@@ -337,7 +337,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 (content with its per-node layout frames + page sizes) this conversion built to a JSON file");
+	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");
 }
 function collectFontFile(value, previous) {
 	return [...previous, value];
@@ -570,10 +570,13 @@ function registerFormatsCommand(program) {
 }
 //#endregion
 //#region src/commands/from-package.ts
-function isFormatVersionOneRecord(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	if (!("formatVersion" in value)) return false;
-	return value.formatVersion === 1;
+function isSchemaVersionMismatchError(error) {
+	if (!(error instanceof Error)) return false;
+	if (error.name !== "SchemaVersionMismatchError") return false;
+	return "dumpVersion" in error && "installedVersion" in error;
+}
+function isLayoutSchemaDemotedError(error) {
+	return error instanceof Error && error.name === "LayoutSchemaDemotedError";
 }
 async function runFromPackage(input, output, options) {
 	const command = "from-package";
@@ -598,19 +601,16 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' is not valid JSON: ${error instanceof Error ? error.message : String(error)}\n`);
 			return 1;
 		}
-		if (documentSchemaKindOf(parsed) === "DocumentPackage" && isFormatVersionOneRecord(parsed)) {
-			process.stderr.write(`[${command}] '${input}' is a DocumentPackage dump at formatVersion 1 (the documents.js 1.x shape: content plus a separate layout half) -- documents.js 2.0.0 replaced it with formatVersion 2 (content carrying its own rendered frames, plus page sizes); re-run the source conversion with --dump-package to write a current dump\n`);
-			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`);
 			return 2;
 		}
-		const bytes = target.format === "csv" ? encodeCsvText(buildCsvText(result.value.content, {
+		const content = flattenPackage(result.value);
+		const bytes = target.format === "csv" ? encodeCsvText(buildCsvText(content, {
 			delimiter: options.delimiter,
 			sheet: options.sheet
-		})) : target.format === "svg" ? encodeSvgText(buildSvgText(result.value.content, { page: options.page })) : buildDocumentBytes(result.value, target.format);
+		})) : target.format === "svg" ? encodeSvgText(buildSvgText(content, { page: options.page })) : buildDocumentBytes(result.value, target.format);
 		await writeOutput(resolvedOutput, bytes);
 		createDiagnosticReporter({
 			json: options.json,
@@ -627,6 +627,14 @@ async function runFromPackage(input, output, options) {
 			process.stderr.write(`[${command}] '${input}' has no recognised $schema -- only a file written by --dump-package can be read back by this command\n`);
 			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`);
+			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;
+		}
 		process.stderr.write(`${formatError(error, options.verbose)}\n`);
 		return mapErrorToExit(error, getAbortReason());
 	}
@@ -1307,7 +1315,7 @@ async function runPdfInspect(input, options) {
 			}
 		});
 		if (options.full) {
-			process.stdout.write(`${JSON.stringify(layoutDocumentWithSchema(layout), void 0, 2)}\n`);
+			process.stdout.write(`${JSON.stringify(layout, void 0, 2)}\n`);
 			return 0;
 		}
 		const imagesByFormat = countImagesByFormat(layout.images);
@@ -1426,7 +1434,7 @@ function registerSetMetadataCommand(program) {
 }
 //#endregion
 //#region package.json
-var version = "2.1.5";
+var version = "3.0.0";
 //#endregion
 //#region src/program.ts
 function createProgram() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-cli",
-  "version": "2.1.5",
+  "version": "3.0.0",
   "description": "CLI and interactive Ink TUI for documents.js: every docx/pptx/odt/odp/ods/odg/odf/pdf/odm/odb/xlsx/csv/svg/markdown conversion, bridge, and editor as a scriptable command or a terminal app.",
   "type": "module",
   "repository": {
@@ -88,7 +88,7 @@
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
     "commander": "^15.0.0",
-    "documents.js": "^2.3.2",
+    "documents.js": "^3.0.1",
     "ink": "^7.1.1",
     "ink-text-input": "^6.0.0",
     "react": "^19.2.8"
@@ -111,7 +111,7 @@
     "ink-testing-library": "^4.0.0",
     "lint-staged": "^17.3.0",
     "odf.js": "^4.0.0",
-    "pdf-codec": "^2.2.20",
+    "pdf-codec": "^3.0.0",
     "publint": "^0.3.22",
     "semantic-release": "^25.0.8",
     "tsdown": "^0.22.14",