js.documents 2.3.2 → 3.0.0

package/dist/convert/convert.js

@@ -11,11 +11,12 @@ import { throwIfAborted } from "../ports/abort.js";
 import { buildOdbTableCsv } from "../odb/csv.js";
 import { readOdbTables } from "../odb/read.js";
 import { odbTablesToSpreadsheetDocument } from "../odb/spreadsheet.js";
+import { assemblePackage } from "./factor-styles.js";
 import { convertDocument } from "./composition.js";
 import { buildXlsxPackage, encodePackage } from "ooxml.js";
-import { COLOR_BLACK, CONTENT_FORMAT_VERSION, DOCUMENT_PACKAGE_FORMAT_VERSION, LAYOUT_FORMAT_VERSION, PAGE_SIZE_A4 } from "document-schema.js";
+import { COLOR_BLACK, PAGE_SIZE_A4 } from "document-schema.js";
+import { LAYOUT_FORMAT_VERSION, createFontMeasurer, createFontRegistry, loadMathFont, writePdf } from "pdf-codec";
 import { decodePackage as decodePackage$1, encodePackage as encodePackage$1, readOdfMetadata, readOdfParagraph, readOdfTable, readOdm } from "odf.js";
-import { createFontMeasurer, createFontRegistry, loadMathFont, writePdf } from "pdf-codec";
 //#region src/convert/convert.ts
 const mathMetricsAt = (sizePt) => loadMathFont().metricsAt(sizePt);
 function docxToPdf(bytes, options) {
@@ -78,16 +79,8 @@ function odfToPdf(bytes, options) {
 		}],
 		images: {}
 	};
-	options?.onDocument?.({
-		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content,
-		pages: [{
-			widthPt: PAGE_SIZE_A4.widthPt,
-			heightPt: PAGE_SIZE_A4.heightPt
-		}]
-	});
 	throwIfAborted(options?.signal);
-	return writePdf(layout, {
+	const out = writePdf(layout, {
 		signal: options?.signal,
 		formulas: [{
 			pageIndex: 0,
@@ -96,6 +89,11 @@ function odfToPdf(bytes, options) {
 			box
 		}]
 	});
+	options?.onDocument?.(assemblePackage(content, [{
+		widthPt: PAGE_SIZE_A4.widthPt,
+		heightPt: PAGE_SIZE_A4.heightPt
+	}]));
+	return out;
 }
 function pdfToDocx(bytes, options) {
 	return convertDocument("pdf", "docx", bytes, options);
@@ -279,7 +277,6 @@ function odmToPdf(bytes, options) {
 	throwIfAborted(options?.signal);
 	const content = {
 		kind: "wordprocessing",
-		formatVersion: CONTENT_FORMAT_VERSION,
 		metadata: resolveMetadataTimestamps(readOdfMetadata(pkg), options?.clock),
 		sections: combinedSections
 	};
@@ -306,10 +303,7 @@ function odbToXlsx(bytes, options) {
 	throwIfAborted(options?.signal);
 	const content = odbTablesToSpreadsheetDocument(tables);
 	const out = encodePackage(buildXlsxPackage(content));
-	options?.onDocument?.({
-		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content
-	});
+	options?.onDocument?.(assemblePackage(content));
 	return out;
 }
 function odbToCsv(bytes, options) {
@@ -318,10 +312,7 @@ function odbToCsv(bytes, options) {
 	const tables = readOdbTables(pkg, { timeZone: options?.timeZone });
 	throwIfAborted(options?.signal);
 	const csv = buildOdbTableCsv(tables, options?.table);
-	if (options?.onDocument !== void 0) options.onDocument({
-		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: odbTablesToSpreadsheetDocument(tables)
-	});
+	if (options?.onDocument !== void 0) options.onDocument(assemblePackage(odbTablesToSpreadsheetDocument(tables)));
 	return csv;
 }
 function odbReportToDocx(content, options) {
@@ -343,17 +334,14 @@ function odbReportToPdf(content, options) {
 		measurer: createFontMeasurer(fonts),
 		mathMetricsAt
 	});
-	options?.onDocument?.({
-		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content,
-		pages: [...pages]
-	});
-	return writePdf(layout, {
+	const out = writePdf(layout, {
 		signal: options?.signal,
 		onSubstitution: options?.onSubstitution,
 		formulas,
 		fonts
 	});
+	options?.onDocument?.(assemblePackage(content, pages));
+	return out;
 }
 //#endregion
 export { OdmUnresolvedSectionError, csvToMarkdown, csvToOds, csvToPdf, csvToXlsx, docxToMarkdown, docxToOdt, docxToPdf, docxToPptx, inlineOdmSectionToContentSection, markdownToCsv, markdownToDocx, markdownToOdt, markdownToPdf, markdownToXlsx, odbReportToDocx, odbReportToOdt, odbReportToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odgToSvg, odmToPdf, odpToOdt, odpToPdf, odpToPptx, odsToCsv, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToOdp, odtToPdf, pdfToCsv, pdfToDocx, pdfToMarkdown, pdfToOdg, pdfToOdp, pdfToOds, pdfToOdt, pdfToPptx, pdfToSvg, pdfToXlsx, pptxToDocx, pptxToOdp, pptxToPdf, svgToOdg, svgToPdf, xlsxToCsv, xlsxToMarkdown, xlsxToOds, xlsxToPdf };

package/dist/convert/decompose.cjs

@@ -0,0 +1,134 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/convert/decompose.ts
+function isHeadingParagraph(paragraph) {
+	return paragraph.headingLevel !== void 0;
+}
+function isListParagraph(paragraph) {
+	return paragraph.list !== void 0;
+}
+function decompose(content) {
+	switch (content.kind) {
+		case "wordprocessing": return content.sections.map(decomposeSection);
+		case "presentation": return content.slides.map(decomposeSlide);
+		case "spreadsheet": return content.sheets.map(decomposeSheet);
+		case "drawing": return content.pages.map(decomposeDrawPage);
+		case "formula": return [content.formula];
+	}
+}
+function decomposeSection(section) {
+	const { blocks, ...rest } = section;
+	return {
+		node: {
+			kind: "section",
+			...rest
+		},
+		children: decomposeSectionBlocks(blocks)
+	};
+}
+function decomposeSectionBlocks(blocks) {
+	const root = [];
+	const headingStack = [];
+	const listStack = [];
+	const headingScope = () => headingStack.at(-1)?.children ?? root;
+	for (const block of blocks) {
+		if (block.kind !== "paragraph") {
+			const parent = listStack.at(-1);
+			(parent !== void 0 ? parent.children : headingScope()).push(block);
+			continue;
+		}
+		if (isHeadingParagraph(block)) {
+			listStack.length = 0;
+			const level = block.headingLevel;
+			for (let top = headingStack.at(-1); top !== void 0 && top.node.headingLevel >= level; top = headingStack.at(-1)) headingStack.pop();
+			const group = {
+				node: block,
+				children: []
+			};
+			const parent = headingStack.at(-1);
+			(parent !== void 0 ? parent.children : root).push(group);
+			headingStack.push(group);
+		} else if (isListParagraph(block)) openListGroup(listStack, headingScope(), block);
+		else {
+			listStack.length = 0;
+			headingScope().push(block);
+		}
+	}
+	return root;
+}
+function decomposeSlide(slide) {
+	const { shapes, ...rest } = slide;
+	return {
+		node: {
+			kind: "slide",
+			...rest
+		},
+		children: shapes.map(decomposeShape)
+	};
+}
+function decomposeSheet(sheet) {
+	const { images, embeddedObjects, ...rest } = sheet;
+	const children = [...images, ...embeddedObjects ?? []];
+	return {
+		node: {
+			kind: "sheet",
+			...rest
+		},
+		children
+	};
+}
+function decomposeDrawPage(page) {
+	const { shapes, vectors, ...rest } = page;
+	const children = [...shapes.map(decomposeShape), ...vectors];
+	return {
+		node: {
+			kind: "drawPage",
+			...rest
+		},
+		children
+	};
+}
+function decomposeShape(shape) {
+	const { blocks, ...rest } = shape;
+	return {
+		node: rest,
+		children: decomposeShapeBlocks(blocks)
+	};
+}
+function decomposeShapeBlocks(blocks) {
+	const root = [];
+	const listStack = [];
+	for (const block of blocks) {
+		if (block.kind !== "paragraph") {
+			const parent = listStack.at(-1);
+			(parent !== void 0 ? parent.children : root).push(block);
+			continue;
+		}
+		if (isListParagraph(block)) {
+			openListGroup(listStack, root, block);
+			continue;
+		}
+		listStack.length = 0;
+		root.push(block);
+	}
+	return root;
+}
+function openListGroup(listStack, scopeChildren, paragraph) {
+	const level = paragraph.list.level;
+	for (let top = listStack.at(-1); top !== void 0 && top.node.list.level >= level; top = listStack.at(-1)) listStack.pop();
+	const group = {
+		node: paragraph,
+		children: []
+	};
+	const parent = listStack.at(-1);
+	(parent !== void 0 ? parent.children : scopeChildren).push(group);
+	listStack.push(group);
+}
+//#endregion
+exports.decompose = decompose;
+exports.decomposeDrawPage = decomposeDrawPage;
+exports.decomposeSection = decomposeSection;
+exports.decomposeShape = decomposeShape;
+exports.decomposeSheet = decomposeSheet;
+exports.decomposeSlide = decomposeSlide;
+exports.isHeadingParagraph = isHeadingParagraph;
+exports.isListParagraph = isListParagraph;

package/dist/convert/decompose.d.cts

@@ -0,0 +1,13 @@
+import { ContentDocument, ContentDrawPage, ContentFormula, ContentParagraph, ContentSection, ContentShape, ContentSheet, ContentSlide, DrawPageGroupNode, HeadingParagraph, ListParagraph, SectionGroupNode, ShapeGroupNode, SheetGroupNode, SlideGroupNode } from "document-schema.js";
+//#region src/convert/decompose.d.ts
+declare function isHeadingParagraph(paragraph: ContentParagraph): paragraph is HeadingParagraph;
+declare function isListParagraph(paragraph: ContentParagraph): paragraph is ListParagraph;
+type PackageChildren = SectionGroupNode[] | SlideGroupNode[] | SheetGroupNode[] | DrawPageGroupNode[] | ContentFormula[];
+declare function decompose(content: ContentDocument): PackageChildren;
+declare function decomposeSection(section: ContentSection): SectionGroupNode;
+declare function decomposeSlide(slide: ContentSlide): SlideGroupNode;
+declare function decomposeSheet(sheet: ContentSheet): SheetGroupNode;
+declare function decomposeDrawPage(page: ContentDrawPage): DrawPageGroupNode;
+declare function decomposeShape(shape: ContentShape): ShapeGroupNode;
+//#endregion
+export { PackageChildren, decompose, decomposeDrawPage, decomposeSection, decomposeShape, decomposeSheet, decomposeSlide, isHeadingParagraph, isListParagraph };

package/dist/convert/decompose.d.ts

@@ -0,0 +1,13 @@
+import { ContentDocument, ContentDrawPage, ContentFormula, ContentParagraph, ContentSection, ContentShape, ContentSheet, ContentSlide, DrawPageGroupNode, HeadingParagraph, ListParagraph, SectionGroupNode, ShapeGroupNode, SheetGroupNode, SlideGroupNode } from "document-schema.js";
+//#region src/convert/decompose.d.ts
+declare function isHeadingParagraph(paragraph: ContentParagraph): paragraph is HeadingParagraph;
+declare function isListParagraph(paragraph: ContentParagraph): paragraph is ListParagraph;
+type PackageChildren = SectionGroupNode[] | SlideGroupNode[] | SheetGroupNode[] | DrawPageGroupNode[] | ContentFormula[];
+declare function decompose(content: ContentDocument): PackageChildren;
+declare function decomposeSection(section: ContentSection): SectionGroupNode;
+declare function decomposeSlide(slide: ContentSlide): SlideGroupNode;
+declare function decomposeSheet(sheet: ContentSheet): SheetGroupNode;
+declare function decomposeDrawPage(page: ContentDrawPage): DrawPageGroupNode;
+declare function decomposeShape(shape: ContentShape): ShapeGroupNode;
+//#endregion
+export { PackageChildren, decompose, decomposeDrawPage, decomposeSection, decomposeShape, decomposeSheet, decomposeSlide, isHeadingParagraph, isListParagraph };

package/dist/convert/decompose.js

@@ -0,0 +1,126 @@
+//#region src/convert/decompose.ts
+function isHeadingParagraph(paragraph) {
+	return paragraph.headingLevel !== void 0;
+}
+function isListParagraph(paragraph) {
+	return paragraph.list !== void 0;
+}
+function decompose(content) {
+	switch (content.kind) {
+		case "wordprocessing": return content.sections.map(decomposeSection);
+		case "presentation": return content.slides.map(decomposeSlide);
+		case "spreadsheet": return content.sheets.map(decomposeSheet);
+		case "drawing": return content.pages.map(decomposeDrawPage);
+		case "formula": return [content.formula];
+	}
+}
+function decomposeSection(section) {
+	const { blocks, ...rest } = section;
+	return {
+		node: {
+			kind: "section",
+			...rest
+		},
+		children: decomposeSectionBlocks(blocks)
+	};
+}
+function decomposeSectionBlocks(blocks) {
+	const root = [];
+	const headingStack = [];
+	const listStack = [];
+	const headingScope = () => headingStack.at(-1)?.children ?? root;
+	for (const block of blocks) {
+		if (block.kind !== "paragraph") {
+			const parent = listStack.at(-1);
+			(parent !== void 0 ? parent.children : headingScope()).push(block);
+			continue;
+		}
+		if (isHeadingParagraph(block)) {
+			listStack.length = 0;
+			const level = block.headingLevel;
+			for (let top = headingStack.at(-1); top !== void 0 && top.node.headingLevel >= level; top = headingStack.at(-1)) headingStack.pop();
+			const group = {
+				node: block,
+				children: []
+			};
+			const parent = headingStack.at(-1);
+			(parent !== void 0 ? parent.children : root).push(group);
+			headingStack.push(group);
+		} else if (isListParagraph(block)) openListGroup(listStack, headingScope(), block);
+		else {
+			listStack.length = 0;
+			headingScope().push(block);
+		}
+	}
+	return root;
+}
+function decomposeSlide(slide) {
+	const { shapes, ...rest } = slide;
+	return {
+		node: {
+			kind: "slide",
+			...rest
+		},
+		children: shapes.map(decomposeShape)
+	};
+}
+function decomposeSheet(sheet) {
+	const { images, embeddedObjects, ...rest } = sheet;
+	const children = [...images, ...embeddedObjects ?? []];
+	return {
+		node: {
+			kind: "sheet",
+			...rest
+		},
+		children
+	};
+}
+function decomposeDrawPage(page) {
+	const { shapes, vectors, ...rest } = page;
+	const children = [...shapes.map(decomposeShape), ...vectors];
+	return {
+		node: {
+			kind: "drawPage",
+			...rest
+		},
+		children
+	};
+}
+function decomposeShape(shape) {
+	const { blocks, ...rest } = shape;
+	return {
+		node: rest,
+		children: decomposeShapeBlocks(blocks)
+	};
+}
+function decomposeShapeBlocks(blocks) {
+	const root = [];
+	const listStack = [];
+	for (const block of blocks) {
+		if (block.kind !== "paragraph") {
+			const parent = listStack.at(-1);
+			(parent !== void 0 ? parent.children : root).push(block);
+			continue;
+		}
+		if (isListParagraph(block)) {
+			openListGroup(listStack, root, block);
+			continue;
+		}
+		listStack.length = 0;
+		root.push(block);
+	}
+	return root;
+}
+function openListGroup(listStack, scopeChildren, paragraph) {
+	const level = paragraph.list.level;
+	for (let top = listStack.at(-1); top !== void 0 && top.node.list.level >= level; top = listStack.at(-1)) listStack.pop();
+	const group = {
+		node: paragraph,
+		children: []
+	};
+	const parent = listStack.at(-1);
+	(parent !== void 0 ? parent.children : scopeChildren).push(group);
+	listStack.push(group);
+}
+//#endregion
+export { decompose, decomposeDrawPage, decomposeSection, decomposeShape, decomposeSheet, decomposeSlide, isHeadingParagraph, isListParagraph };