reamkit 1.2.0 → 1.3.0

package/dist/esm/excel/xlsx-reader.js

@@ -1,8 +1,13 @@
+import { pt } from "../core/ir/units.js";
 import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
 import { EMPTY_STYLE_SHEET, resolveBodyStyles } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
 import { bytesInclude } from "../core/bytes.js";
+import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
+import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
+import { parseTheme } from "../core/drawingml/theme-parser.js";
+import { isOoxmlRel } from "../core/opc/relationship-types.js";
 import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
 import "../core/opc/index.js";
@@ -12,6 +17,7 @@ import { parseWorksheet } from "./worksheet-parser.js";
 import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "./styles-parser.js";
 import "./index.js";
 import { resolvePrintArea, resolvePrintTitleRows, sectionFromWorksheet, worksheetToBody } from "./print-model.js";
+import { parseSheetDrawing } from "./sheet-drawing.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
 var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
@@ -29,6 +35,8 @@ function readXlsx(xlsx) {
 	const styles = stylesData ? parseXlsxStyles(stylesData) : EMPTY_XLSX_STYLES;
 	const workbookRels = pkg.getPartRelationships(WORKBOOK_PART);
 	const body = [];
+	const charts = /* @__PURE__ */ new Map();
+	const resolveColor = buildXlsxColorResolver(pkg, workbookRels);
 	let firstSheetSection;
 	for (let sheetIdx = 0; sheetIdx < sheets.length; sheetIdx++) {
 		const sheet = sheets[sheetIdx];
@@ -53,6 +61,27 @@ function readXlsx(xlsx) {
 			...titleRows ? { titleRows } : {},
 			gridLines
 		}));
+		if (worksheet.drawingRelId) {
+			const drawingRel = pkg.getPartRelationships(resolved.path).find((r) => r.id === worksheet.drawingRelId);
+			const drawing = drawingRel ? pkg.resolveRelatedPart(resolved.path, drawingRel) : void 0;
+			if (drawing) for (const ref of parseSheetDrawing(drawing.data, drawing.path, pkg, worksheet)) {
+				if (!charts.has(ref.chartPartPath)) {
+					const chartData = pkg.getPart(ref.chartPartPath);
+					const parsed = chartData ? parseChart(chartData, resolveColor) : null;
+					if (!parsed) continue;
+					charts.set(ref.chartPartPath, withChartColorStyle(parsed, pkg, ref.chartPartPath, resolveColor));
+				}
+				body.push({
+					kind: "chart",
+					chart: {
+						chartRelId: ref.chartPartPath,
+						width: pt(ref.widthPt),
+						height: pt(ref.heightPt),
+						paragraphProperties: {}
+					}
+				});
+			}
+		}
 	}
 	const coreData = pkg.getPart(CORE_PROPS_PART);
 	const info = infoFromCore(coreData ? parseCoreProperties(coreData) : void 0);
@@ -64,11 +93,23 @@ function readXlsx(xlsx) {
 			...firstSheetSection ? { section: firstSheetSection } : {},
 			styles: EMPTY_STYLE_SHEET,
 			resources: new ResourceStore(),
+			...charts.size > 0 ? { charts } : {},
 			...info ? { info } : {}
 		},
 		losses: []
 	};
 }
+function buildXlsxColorResolver(pkg, workbookRels) {
+	const palette = new Map(DEFAULT_THEME_PALETTE);
+	for (const rel of workbookRels) {
+		if (!isOoxmlRel(rel.type, "theme")) continue;
+		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+		if (!resolved) continue;
+		for (const [slot, hex] of parseTheme(resolved.data)) palette.set(slot, hex);
+		break;
+	}
+	return makeColorResolver(palette);
+}
 var xlsxReader = {
 	id: "xlsx",
 	produces: "flow",

package/dist/esm/excel/xlsx-to-pdf.js

@@ -1,7 +1,7 @@
 import { fetchFontSet } from "../core/fonts/remote-fonts.js";
 import { FontRegistry } from "../core/font/font-registry.js";
 import { signPdf } from "../pdf/signature.js";
-import { renderStyledPdf } from "../pdf/styled-page-renderer.js";
+import { renderStyledPdf, renderStyledPdfEncrypted } from "../pdf/styled-page-renderer.js";
 import "../pdf/index.js";
 import { readXlsx } from "./xlsx-reader.js";
 import { flowRenderOptions } from "../core/converter/project.js";
@@ -18,18 +18,18 @@ async function convertXlsxToPdf(xlsx, options = {}) {
 		...options,
 		signaturePlaceholder: signature
 	} : options;
-	let pdf;
-	if (renderOptions.fonts ?? renderOptions.fontBytes) pdf = convertXlsxToPdfSync(xlsx, renderOptions);
-	else {
-		const fonts = await fetchFontSet({
+	const withFonts = renderOptions.fonts ?? renderOptions.fontBytes ? renderOptions : {
+		...renderOptions,
+		fonts: await fetchFontSet({
 			...options.fontFamily ? { family: options.fontFamily } : {},
 			...options.fontFetch ? { fetch: options.fontFetch } : {}
-		});
-		pdf = convertXlsxToPdfSync(xlsx, {
-			...renderOptions,
-			fonts
-		});
+		})
+	};
+	if (withFonts.encrypt) {
+		const args = prepareXlsxStyledRender(xlsx, withFonts);
+		return renderStyledPdfEncrypted(args.body, args.styled);
 	}
+	const pdf = convertXlsxToPdfSync(xlsx, withFonts);
 	return signature ? signPdf(pdf, signature) : pdf;
 }
 /**
@@ -38,6 +38,10 @@ async function convertXlsxToPdf(xlsx, options = {}) {
 * Internal since 1.0 — see the async variant above.
 */
 function convertXlsxToPdfSync(xlsx, options) {
+	const args = prepareXlsxStyledRender(xlsx, options);
+	return renderStyledPdf(args.body, args.styled);
+}
+function prepareXlsxStyledRender(xlsx, options) {
 	const fonts = options.fonts ?? (options.fontBytes ? { regular: options.fontBytes } : void 0);
 	if (!fonts) throw new Error("convertXlsxToPdfSync requires options.fonts or options.fontBytes");
 	const registry = FontRegistry.fromBytes(fonts);
@@ -56,14 +60,17 @@ function convertXlsxToPdfSync(xlsx, options) {
 		relationship: "Source",
 		description: "Source Excel workbook"
 	});
-	return renderStyledPdf(flow.body, {
-		registry,
-		...flowRenderOptions(flow),
-		...section ? { section } : {},
-		...info ? { info } : {},
-		...attachments.length > 0 ? { attachments } : {},
-		...renderOptions
-	});
+	return {
+		body: flow.body,
+		styled: {
+			registry,
+			...flowRenderOptions(flow),
+			...section ? { section } : {},
+			...info ? { info } : {},
+			...attachments.length > 0 ? { attachments } : {},
+			...renderOptions
+		}
+	};
 }
 //#endregion
 export { convertXlsxToPdf };

package/dist/esm/index.d.ts

@@ -4,6 +4,7 @@ export { renderStyledPdf } from './pdf/index.js';
 export type { StyledRenderOptions, DocumentInfo } from './pdf/index.js';
 export { signPdf } from './pdf/index.js';
 export type { SignaturePlaceholder, SignerCredentials, SignatureOptions } from './pdf/index.js';
+export type { PdfEncryptOptions, PdfPermissions } from './pdf/index.js';
 export { FontRegistry, parseTtf, subsetTtf } from './core/font/index.js';
 export type { FontBytesByVariant, FontVariant, ParsedTtf } from './core/font/index.js';
 export { getHyphenator, createLanguageHyphenator, createHyphenator, splitPatternBundle, } from './core/hyphenation/index.js';

package/dist/esm/layout/page-doc.d.ts

@@ -16,6 +16,7 @@ export interface TextToken {
     readonly href?: string;
     readonly footnoteRef?: string;
     readonly anchor?: string;
+    readonly listMarker?: true;
     readonly resolvedRun: ResolvedRunProperties;
     readonly font: FontResource;
     readonly fontSizePt: number;

package/dist/esm/layout/styled-layout.d.ts

@@ -5,6 +5,7 @@ import { Hyphenator } from '../core/hyphenation/index.js';
 import { LaidOutDocument, PageItem } from './page-doc.js';
 import { AttachedFile } from '../pdf/embedded-file.js';
 import { SignaturePlaceholder } from '../pdf/signature.js';
+import { PdfEncryptOptions } from '../pdf/encryption.js';
 import { ResourceStore } from '../core/ir/index.js';
 import { StructTreeBuilder } from '../pdf/struct-tree.js';
 export type PdfALevel = 'PDF/A-1b' | 'PDF/A-1a' | 'PDF/A-2b' | 'PDF/A-2u' | 'PDF/A-2a' | 'PDF/A-3b' | 'PDF/A-3u' | 'PDF/A-3a';
@@ -39,6 +40,7 @@ export interface StyledRenderOptions {
     readonly tagged?: boolean;
     readonly pdfUA?: boolean;
     readonly language?: string;
+    readonly encrypt?: PdfEncryptOptions;
     readonly attachments?: ReadonlyArray<AttachedFile>;
     readonly signaturePlaceholder?: SignaturePlaceholder;
 }