doc-codec 2.6.0 → 2.7.0

package/dist/write.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_errors = require("./errors.cjs");
+const require_data_stream = require("./data-stream.cjs");
 const require_detect = require("./detect.cjs");
 require("./prop/fkp.cjs");
 const require_style_stsh = require("./style/stsh.cjs");
@@ -22,16 +23,22 @@ const TEXT_FC = 1024;
 const BYTES_PER_CHARACTER = 2;
 function writeDocContent(document, options = {}) {
 	if (document.kind !== "wordprocessing") throw new require_errors.DocUnsupportedError(`doc-codec writes wordprocessing documents only; got a '${document.kind}' document`);
-	if (document.sections.length !== 1) throw new require_errors.DocUnsupportedError(`doc-codec's reader never distinguishes more than one section within a document (see README's "Section properties" scope note): writeDocContent refuses ${document.sections.length} sections rather than silently merging their content into what would read back as one`);
-	const [section] = document.sections;
-	if (section === void 0) throw new require_errors.DocFormatError("a wordprocessing document must carry a section");
-	const writeParagraphs = require_table_write.flattenSectionBlocks(section.blocks, options.onWarning);
-	if (writeParagraphs[writeParagraphs.length - 1]?.terminator !== 13) writeParagraphs.push({
-		runs: [],
-		properties: {},
-		extraGrpprl: [],
-		terminator: 13
+	if (document.sections.length === 0) throw new require_errors.DocFormatError("a wordprocessing document must carry at least one section");
+	const dataStream = new require_data_stream.DataStreamBuilder();
+	const sectionParagraphLists = document.sections.map((section, index) => {
+		const paragraphs = require_table_write.flattenSectionBlocks(section.blocks, dataStream, options.onWarning);
+		closeSection(paragraphs, index === document.sections.length - 1 ? 13 : 12);
+		return paragraphs;
 	});
+	const sectionStartIndices = [];
+	{
+		let runningIndex = 0;
+		for (const paragraphs of sectionParagraphLists) {
+			sectionStartIndices.push(runningIndex);
+			runningIndex += paragraphs.length;
+		}
+	}
+	const writeParagraphs = sectionParagraphLists.flat();
 	const FIRST_NON_HEADING_ISTD = 10;
 	const MAX_HEADING_ISTD = 9;
 	const styleNames = /* @__PURE__ */ new Map();
@@ -72,9 +79,9 @@ function writeDocContent(document, options = {}) {
 	};
 	const numberingTables = require_list_numbering_write.buildNumberingTables(listUsage.definitions);
 	const formatted = writeParagraphs.map((entry) => ({
-		runs: entry.runs.map((run) => ({
-			text: run.text,
-			grpprl: require_prop_chp_write.encodeCharacterGrpprl(run, fontIndexOf)
+		runs: entry.runs.map((writeRun) => ({
+			text: writeRun.run.text,
+			grpprl: [...require_prop_chp_write.encodeCharacterGrpprl(writeRun.run, fontIndexOf), ...writeRun.extraGrpprl]
 		})),
 		grpprl: [...require_prop_pap_write.encodeParagraphGrpprl(entry.properties, ilfoOf), ...entry.extraGrpprl]
 	}));
@@ -132,9 +139,20 @@ function writeDocContent(document, options = {}) {
 		};
 	});
 	const papxPages = require_prop_fkp_write.buildPapxPages(papxParagraphSpecs, textFcLim);
-	const sepx = require_prop_sep_write.buildSepx(require_prop_sep_write.encodeSectionGrpprl(section));
-	const fcSepx = (papxPageStart + papxPages.length) * 512;
-	const wordDocument = new Uint8Array(fcSepx + sepx.length);
+	const sepxPageStart = (papxPageStart + papxPages.length) * 512;
+	const sepxList = document.sections.map((section) => require_prop_sep_write.buildSepx(require_prop_sep_write.encodeSectionGrpprl(section)));
+	const fcSepxList = [];
+	{
+		let sepxCursor = sepxPageStart;
+		for (const sepx of sepxList) {
+			fcSepxList.push(sepxCursor);
+			sepxCursor += sepx.length;
+		}
+	}
+	const lastFcSepx = fcSepxList[fcSepxList.length - 1];
+	const lastSepx = sepxList[sepxList.length - 1];
+	if (lastFcSepx === void 0 || lastSepx === void 0) throw new require_errors.DocFormatError("internal defect: writeDocContent built an empty section list despite the earlier at-least-one-section guard");
+	const wordDocument = new Uint8Array(lastFcSepx + lastSepx.length);
 	const wordView = new DataView(wordDocument.buffer);
 	for (let index = 0; index < text.length; index += 1) wordView.setUint16(characterFc(index), text.charCodeAt(index), true);
 	chpxPages.forEach((page, index) => {
@@ -143,13 +161,22 @@ function writeDocContent(document, options = {}) {
 	papxPages.forEach((page, index) => {
 		wordDocument.set(page, (papxPageStart + index) * 512);
 	});
-	wordDocument.set(sepx, fcSepx);
+	sepxList.forEach((sepx, index) => {
+		const fcSepx = fcSepxList[index];
+		if (fcSepx === void 0) throw new require_errors.DocFormatError(`internal defect: writeDocContent lost section ${String(index)}'s own Sepx placement`);
+		wordDocument.set(sepx, fcSepx);
+	});
+	const sectionStartCps = sectionStartIndices.map((paragraphIndex, index) => {
+		const startCp = paragraphStarts[paragraphIndex];
+		if (startCp === void 0) throw new require_errors.DocFormatError(`internal defect: writeDocContent lost section ${String(index)}'s own start CP`);
+		return startCp;
+	});
 	const clx = require_text_piece_table_write.buildTextClx(text.length, TEXT_FC);
 	const chpxBinTable = require_prop_fkp_write.buildPropertyBinTable([...chpxPages.map(require_prop_fkp_write.firstFcOfPage), textFcLim], chpxPages.map((_, index) => chpxPageStart + index));
 	const papxBinTable = require_prop_fkp_write.buildPropertyBinTable([...papxPages.map(require_prop_fkp_write.firstFcOfPage), textFcLim], papxPages.map((_, index) => papxPageStart + index));
 	const stsh = require_style_stsh.buildStshForStyles(styleNames);
 	const fontTable = fontNames.length > 0 ? require_style_fonts.buildFontTable(fontNames) : void 0;
-	const plcfSed = require_prop_sep_write.buildPlcfSed(text.length, fcSepx);
+	const plcfSed = require_prop_sep_write.buildPlcfSed(sectionStartCps, text.length, fcSepxList);
 	let cursor = 0;
 	const place = (bytes) => {
 		const offset = cursor;
@@ -207,11 +234,32 @@ function writeDocContent(document, options = {}) {
 		path: require_detect.SUMMARY_INFORMATION_STREAM,
 		bytes: (0, archive_codec.writeSummaryInformationStream)(require_metadata.layoutMetadataToSummaryInformation(document.metadata))
 	});
+	const dataStreamBytes = dataStream.build();
+	if (dataStreamBytes.length > 0) streams.push({
+		path: require_detect.DATA_STREAM,
+		bytes: dataStreamBytes
+	});
 	return (0, archive_codec.writeCompoundFile)(streams);
 }
 function sameGrpprl(a, b) {
 	if (a === void 0 || b === void 0) return a === b;
 	return a.length === b.length && a.every((byte, index) => byte === b[index]);
 }
+function closeSection(paragraphs, terminator) {
+	if (paragraphs[paragraphs.length - 1]?.terminator !== 13) paragraphs.push({
+		runs: [],
+		properties: {},
+		extraGrpprl: [],
+		terminator: 13
+	});
+	if (terminator === 13) return;
+	const index = paragraphs.length - 1;
+	const target = paragraphs[index];
+	if (target === void 0) throw new require_errors.DocFormatError("internal defect: closeSection lost its own just-ensured trailing paragraph");
+	paragraphs[index] = {
+		...target,
+		terminator
+	};
+}
 //#endregion
 exports.writeDocContent = writeDocContent;

package/dist/write.d.cts

@@ -1,4 +1,4 @@
-import { n as WriteWarning } from "./write-SN_aIwyF.cjs";
+import { r as WriteWarning } from "./write-CMB3qF4i.cjs";
 import { ContentDocument } from "document-schema.js";
 //#region src/write.d.ts
 interface WriteDocContentOptions {

package/dist/write.d.ts

@@ -1,4 +1,4 @@
-import { n as WriteWarning } from "./write-SN_aIwyF.js";
+import { r as WriteWarning } from "./write-t4rFgnA-.js";
 import { ContentDocument } from "document-schema.js";
 //#region src/write.d.ts
 interface WriteDocContentOptions {

package/dist/write.js

@@ -1,5 +1,6 @@
 import { DocFormatError, DocUnsupportedError } from "./errors.js";
-import { SUMMARY_INFORMATION_STREAM, WORD_DOCUMENT_STREAM } from "./detect.js";
+import { DataStreamBuilder } from "./data-stream.js";
+import { DATA_STREAM, SUMMARY_INFORMATION_STREAM, WORD_DOCUMENT_STREAM } from "./detect.js";
 import "./prop/fkp.js";
 import { buildStshForStyles } from "./style/stsh.js";
 import "./text/special.js";
@@ -21,16 +22,22 @@ const TEXT_FC = 1024;
 const BYTES_PER_CHARACTER = 2;
 function writeDocContent(document, options = {}) {
 	if (document.kind !== "wordprocessing") throw new DocUnsupportedError(`doc-codec writes wordprocessing documents only; got a '${document.kind}' document`);
-	if (document.sections.length !== 1) throw new DocUnsupportedError(`doc-codec's reader never distinguishes more than one section within a document (see README's "Section properties" scope note): writeDocContent refuses ${document.sections.length} sections rather than silently merging their content into what would read back as one`);
-	const [section] = document.sections;
-	if (section === void 0) throw new DocFormatError("a wordprocessing document must carry a section");
-	const writeParagraphs = flattenSectionBlocks(section.blocks, options.onWarning);
-	if (writeParagraphs[writeParagraphs.length - 1]?.terminator !== 13) writeParagraphs.push({
-		runs: [],
-		properties: {},
-		extraGrpprl: [],
-		terminator: 13
+	if (document.sections.length === 0) throw new DocFormatError("a wordprocessing document must carry at least one section");
+	const dataStream = new DataStreamBuilder();
+	const sectionParagraphLists = document.sections.map((section, index) => {
+		const paragraphs = flattenSectionBlocks(section.blocks, dataStream, options.onWarning);
+		closeSection(paragraphs, index === document.sections.length - 1 ? 13 : 12);
+		return paragraphs;
 	});
+	const sectionStartIndices = [];
+	{
+		let runningIndex = 0;
+		for (const paragraphs of sectionParagraphLists) {
+			sectionStartIndices.push(runningIndex);
+			runningIndex += paragraphs.length;
+		}
+	}
+	const writeParagraphs = sectionParagraphLists.flat();
 	const FIRST_NON_HEADING_ISTD = 10;
 	const MAX_HEADING_ISTD = 9;
 	const styleNames = /* @__PURE__ */ new Map();
@@ -71,9 +78,9 @@ function writeDocContent(document, options = {}) {
 	};
 	const numberingTables = buildNumberingTables(listUsage.definitions);
 	const formatted = writeParagraphs.map((entry) => ({
-		runs: entry.runs.map((run) => ({
-			text: run.text,
-			grpprl: encodeCharacterGrpprl(run, fontIndexOf)
+		runs: entry.runs.map((writeRun) => ({
+			text: writeRun.run.text,
+			grpprl: [...encodeCharacterGrpprl(writeRun.run, fontIndexOf), ...writeRun.extraGrpprl]
 		})),
 		grpprl: [...encodeParagraphGrpprl(entry.properties, ilfoOf), ...entry.extraGrpprl]
 	}));
@@ -131,9 +138,20 @@ function writeDocContent(document, options = {}) {
 		};
 	});
 	const papxPages = buildPapxPages(papxParagraphSpecs, textFcLim);
-	const sepx = buildSepx(encodeSectionGrpprl(section));
-	const fcSepx = (papxPageStart + papxPages.length) * 512;
-	const wordDocument = new Uint8Array(fcSepx + sepx.length);
+	const sepxPageStart = (papxPageStart + papxPages.length) * 512;
+	const sepxList = document.sections.map((section) => buildSepx(encodeSectionGrpprl(section)));
+	const fcSepxList = [];
+	{
+		let sepxCursor = sepxPageStart;
+		for (const sepx of sepxList) {
+			fcSepxList.push(sepxCursor);
+			sepxCursor += sepx.length;
+		}
+	}
+	const lastFcSepx = fcSepxList[fcSepxList.length - 1];
+	const lastSepx = sepxList[sepxList.length - 1];
+	if (lastFcSepx === void 0 || lastSepx === void 0) throw new DocFormatError("internal defect: writeDocContent built an empty section list despite the earlier at-least-one-section guard");
+	const wordDocument = new Uint8Array(lastFcSepx + lastSepx.length);
 	const wordView = new DataView(wordDocument.buffer);
 	for (let index = 0; index < text.length; index += 1) wordView.setUint16(characterFc(index), text.charCodeAt(index), true);
 	chpxPages.forEach((page, index) => {
@@ -142,13 +160,22 @@ function writeDocContent(document, options = {}) {
 	papxPages.forEach((page, index) => {
 		wordDocument.set(page, (papxPageStart + index) * 512);
 	});
-	wordDocument.set(sepx, fcSepx);
+	sepxList.forEach((sepx, index) => {
+		const fcSepx = fcSepxList[index];
+		if (fcSepx === void 0) throw new DocFormatError(`internal defect: writeDocContent lost section ${String(index)}'s own Sepx placement`);
+		wordDocument.set(sepx, fcSepx);
+	});
+	const sectionStartCps = sectionStartIndices.map((paragraphIndex, index) => {
+		const startCp = paragraphStarts[paragraphIndex];
+		if (startCp === void 0) throw new DocFormatError(`internal defect: writeDocContent lost section ${String(index)}'s own start CP`);
+		return startCp;
+	});
 	const clx = buildTextClx(text.length, TEXT_FC);
 	const chpxBinTable = buildPropertyBinTable([...chpxPages.map(firstFcOfPage), textFcLim], chpxPages.map((_, index) => chpxPageStart + index));
 	const papxBinTable = buildPropertyBinTable([...papxPages.map(firstFcOfPage), textFcLim], papxPages.map((_, index) => papxPageStart + index));
 	const stsh = buildStshForStyles(styleNames);
 	const fontTable = fontNames.length > 0 ? buildFontTable(fontNames) : void 0;
-	const plcfSed = buildPlcfSed(text.length, fcSepx);
+	const plcfSed = buildPlcfSed(sectionStartCps, text.length, fcSepxList);
 	let cursor = 0;
 	const place = (bytes) => {
 		const offset = cursor;
@@ -206,11 +233,32 @@ function writeDocContent(document, options = {}) {
 		path: SUMMARY_INFORMATION_STREAM,
 		bytes: writeSummaryInformationStream(layoutMetadataToSummaryInformation$1(document.metadata))
 	});
+	const dataStreamBytes = dataStream.build();
+	if (dataStreamBytes.length > 0) streams.push({
+		path: DATA_STREAM,
+		bytes: dataStreamBytes
+	});
 	return writeCompoundFile(streams);
 }
 function sameGrpprl(a, b) {
 	if (a === void 0 || b === void 0) return a === b;
 	return a.length === b.length && a.every((byte, index) => byte === b[index]);
 }
+function closeSection(paragraphs, terminator) {
+	if (paragraphs[paragraphs.length - 1]?.terminator !== 13) paragraphs.push({
+		runs: [],
+		properties: {},
+		extraGrpprl: [],
+		terminator: 13
+	});
+	if (terminator === 13) return;
+	const index = paragraphs.length - 1;
+	const target = paragraphs[index];
+	if (target === void 0) throw new DocFormatError("internal defect: closeSection lost its own just-ensured trailing paragraph");
+	paragraphs[index] = {
+		...target,
+		terminator
+	};
+}
 //#endregion
 export { writeDocContent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doc-codec",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "A hand-written reader for the Word Binary File Format ([MS-DOC], .doc) against the shared document-schema.js content pivot: FIB parsing, piece-table text reconstruction, and CHPX/PAPX formatting exceptions.",
   "type": "module",
   "repository": {