xls-codec 4.13.0 → 4.15.0

package/dist/write.cjs

@@ -9,6 +9,7 @@ const require_metadata = require("./metadata.cjs");
 const require_workbook_globals_writer = require("./workbook/globals-writer.cjs");
 const require_written_cells = require("./written-cells.cjs");
 const require_workbook_sheet_writer = require("./workbook/sheet-writer.cjs");
+const require_workbook_drawing_writer = require("./workbook/drawing-writer.cjs");
 let archive_codec = require("archive-codec");
 let document_schema_js = require("document-schema.js");
 let excel_number_format = require("excel-number-format");
@@ -120,7 +121,7 @@ function buildPalettePlan(sheets) {
 			record(cell.borders?.bottom?.color);
 		}
 		for (const rule of sheet.conditionalFormats ?? []) {
-			if (rule.type !== "cellIs") continue;
+			if (!("style" in rule)) continue;
 			record(rule.style?.textColor);
 			record(rule.style?.background);
 		}
@@ -340,6 +341,7 @@ function buildWorkbookStream(content) {
 	const palettePlan = buildPalettePlan(content.sheets);
 	const fontPlan = buildFontPlan(content.sheets, palettePlan);
 	const cellXfPlan = buildCellXfPlan(content.sheets, formatPlan, palettePlan, fontPlan);
+	const drawingPlan = require_workbook_drawing_writer.buildDrawingWritePlan(content.sheets);
 	const globalsPlan = {
 		sheetNames: content.sheets.map((sheet) => sheet.name),
 		fonts: fontPlan.fontEntries,
@@ -349,7 +351,8 @@ function buildWorkbookStream(content) {
 		sharedStringTotalCount: sstPlan.totalCount,
 		paletteColors: palettePlan.paletteColors,
 		printNames: buildPrintNamePlan(content.sheets),
-		definedNames: require_workbook_defined_names.definedNameEntriesFor(content.names ?? [], content.sheets)
+		definedNames: require_workbook_defined_names.definedNameEntriesFor(content.names ?? [], content.sheets),
+		drawingGroupBytes: drawingPlan.drawingGroupBytes
 	};
 	const globals = require_workbook_globals_writer.buildWorkbookGlobals(globalsPlan);
 	const sheetContext = {
@@ -357,7 +360,11 @@ function buildWorkbookStream(content) {
 		sstIndexFor: (text) => sstPlan.indexOf(text),
 		icvOf: palettePlan.icvOf
 	};
-	const sheetStreams = content.sheets.map((sheet) => require_workbook_sheet_writer.buildWorksheetSubstream(sheet, sheetContext));
+	const sheetStreams = content.sheets.map((sheet, index) => {
+		const drawing = drawingPlan.sheetDrawings[index];
+		if (drawing === void 0) throw new require_biff_write_errors.BiffWriteError(`internal error: sheet ${index} has no drawing plan entry -- buildDrawingWritePlan produced fewer entries than there are sheets`);
+		return require_workbook_sheet_writer.buildWorksheetSubstream(sheet, sheetContext, drawing);
+	});
 	const sheetOffsets = [];
 	let offset = globals.bytes.length;
 	for (const stream of sheetStreams) {
@@ -366,7 +373,10 @@ function buildWorkbookStream(content) {
 	}
 	const globalsBytes = globals.bytes.slice();
 	patchBoundSheetOffsets(globalsBytes, globals.lbPlyPosOffsets, sheetOffsets);
-	return concatBytes([globalsBytes, ...sheetStreams]);
+	return {
+		bytes: concatBytes([globalsBytes, ...sheetStreams]),
+		embeddingStreams: drawingPlan.embeddingStreams
+	};
 }
 /**
 * Writes a spreadsheet ContentDocument to real .xls bytes: a BIFF8 Workbook stream wrapped in an [MS-CFB] compound file.
@@ -374,11 +384,11 @@ function buildWorkbookStream(content) {
 * The counterpart of content.ts's readXlsContent. See this package's README for the writer's full scope.
 */
 function writeXlsContent(content) {
-	const stream = buildWorkbookStream(content);
+	const workbook = buildWorkbookStream(content);
 	const streams = [{
 		path: WORKBOOK_STREAM_NAME,
-		bytes: stream
-	}];
+		bytes: workbook.bytes
+	}, ...workbook.embeddingStreams];
 	if ((0, archive_codec.hasSummaryInformationFields)(content.metadata)) streams.push({
 		path: require_container.SUMMARY_INFORMATION_STREAM,
 		bytes: (0, archive_codec.writeSummaryInformationStream)(require_metadata.layoutMetadataToSummaryInformation(content.metadata))

package/dist/write.js

@@ -8,6 +8,7 @@ import { layoutMetadataToSummaryInformation as layoutMetadataToSummaryInformatio
 import { GENERAL_CELL_XF_INDEX, buildWorkbookGlobals } from "./workbook/globals-writer.js";
 import { cellCarriesFormatting, writesCellRecord } from "./written-cells.js";
 import { buildWorksheetSubstream } from "./workbook/sheet-writer.js";
+import { buildDrawingWritePlan } from "./workbook/drawing-writer.js";
 import { hasSummaryInformationFields, writeCompoundFile, writeSummaryInformationStream } from "archive-codec";
 import { colorToRgbHex, flattenTree, unrecognizedFillKind } from "document-schema.js";
 import { BUILTIN_NUMBER_FORMATS, isIsoCurrencyCodeShape } from "excel-number-format";
@@ -119,7 +120,7 @@ function buildPalettePlan(sheets) {
 			record(cell.borders?.bottom?.color);
 		}
 		for (const rule of sheet.conditionalFormats ?? []) {
-			if (rule.type !== "cellIs") continue;
+			if (!("style" in rule)) continue;
 			record(rule.style?.textColor);
 			record(rule.style?.background);
 		}
@@ -339,6 +340,7 @@ function buildWorkbookStream(content) {
 	const palettePlan = buildPalettePlan(content.sheets);
 	const fontPlan = buildFontPlan(content.sheets, palettePlan);
 	const cellXfPlan = buildCellXfPlan(content.sheets, formatPlan, palettePlan, fontPlan);
+	const drawingPlan = buildDrawingWritePlan(content.sheets);
 	const globalsPlan = {
 		sheetNames: content.sheets.map((sheet) => sheet.name),
 		fonts: fontPlan.fontEntries,
@@ -348,7 +350,8 @@ function buildWorkbookStream(content) {
 		sharedStringTotalCount: sstPlan.totalCount,
 		paletteColors: palettePlan.paletteColors,
 		printNames: buildPrintNamePlan(content.sheets),
-		definedNames: definedNameEntriesFor(content.names ?? [], content.sheets)
+		definedNames: definedNameEntriesFor(content.names ?? [], content.sheets),
+		drawingGroupBytes: drawingPlan.drawingGroupBytes
 	};
 	const globals = buildWorkbookGlobals(globalsPlan);
 	const sheetContext = {
@@ -356,7 +359,11 @@ function buildWorkbookStream(content) {
 		sstIndexFor: (text) => sstPlan.indexOf(text),
 		icvOf: palettePlan.icvOf
 	};
-	const sheetStreams = content.sheets.map((sheet) => buildWorksheetSubstream(sheet, sheetContext));
+	const sheetStreams = content.sheets.map((sheet, index) => {
+		const drawing = drawingPlan.sheetDrawings[index];
+		if (drawing === void 0) throw new BiffWriteError(`internal error: sheet ${index} has no drawing plan entry -- buildDrawingWritePlan produced fewer entries than there are sheets`);
+		return buildWorksheetSubstream(sheet, sheetContext, drawing);
+	});
 	const sheetOffsets = [];
 	let offset = globals.bytes.length;
 	for (const stream of sheetStreams) {
@@ -365,7 +372,10 @@ function buildWorkbookStream(content) {
 	}
 	const globalsBytes = globals.bytes.slice();
 	patchBoundSheetOffsets(globalsBytes, globals.lbPlyPosOffsets, sheetOffsets);
-	return concatBytes([globalsBytes, ...sheetStreams]);
+	return {
+		bytes: concatBytes([globalsBytes, ...sheetStreams]),
+		embeddingStreams: drawingPlan.embeddingStreams
+	};
 }
 /**
 * Writes a spreadsheet ContentDocument to real .xls bytes: a BIFF8 Workbook stream wrapped in an [MS-CFB] compound file.
@@ -373,11 +383,11 @@ function buildWorkbookStream(content) {
 * The counterpart of content.ts's readXlsContent. See this package's README for the writer's full scope.
 */
 function writeXlsContent(content) {
-	const stream = buildWorkbookStream(content);
+	const workbook = buildWorkbookStream(content);
 	const streams = [{
 		path: WORKBOOK_STREAM_NAME,
-		bytes: stream
-	}];
+		bytes: workbook.bytes
+	}, ...workbook.embeddingStreams];
 	if (hasSummaryInformationFields(content.metadata)) streams.push({
 		path: SUMMARY_INFORMATION_STREAM,
 		bytes: writeSummaryInformationStream(layoutMetadataToSummaryInformation$1(content.metadata))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xls-codec",
-  "version": "4.13.0",
+  "version": "4.15.0",
   "description": "Hand-written reader for the legacy Excel Binary File Format (.xls, BIFF8) as specified by [MS-XLS], mapping a workbook's record stream onto the shared document-schema.js spreadsheet model - the .xls codec for the documents.js family.",
   "type": "module",
   "repository": {
@@ -70,9 +70,9 @@
   },
   "packageManager": "pnpm@11.6.0",
   "dependencies": {
-    "archive-codec": "1.10.8",
-    "document-schema.js": "7.10.0",
-    "excel-number-format": "1.1.1"
+    "archive-codec": "1.11.0",
+    "document-schema.js": "7.11.0",
+    "excel-number-format": "1.2.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",