xls-codec 4.8.0 → 4.9.0

package/dist/workbook/conditional-format.js

@@ -60,27 +60,42 @@ function parseDxfStyle(dxfBytes) {
 		return;
 	}
 }
-function readCf(record, ranges, formulaSheets) {
+/** The shared byte-layout parse both readCf and conditional-format.ts's own readCondFmtGroup need: ct/cp/cce1/cce2, the dxf trailer's own bytes (its length inferred from the record's total size the same way this file always has, since [MS-XLS] never states it directly), and the two formula operands. Returns undefined for a truncated/malformed record rather than throwing, so a caller can fold this into its own try/catch or call it standalone. */
+function parseCfBytes(record) {
 	try {
 		const cursor = new BlockCursor(record.blocks);
 		const ct = cursor.u8();
 		const cp = cursor.u8();
 		const cce1 = cursor.u16();
 		const cce2 = cursor.u16();
-		if (ct === 2) return;
-		const operator = CP_TO_OPERATOR.get(cp);
-		if (operator === void 0) return;
 		const dxfLength = recordByteLength(record) - 6 - cce1 - cce2;
-		const dxfBytes = cursor.take(dxfLength);
-		const rgce1 = cursor.take(cce1);
-		const rgce2 = cursor.take(cce2);
-		if (cce1 === 0) return;
+		return {
+			ct,
+			cp,
+			dxfBytes: cursor.take(dxfLength),
+			rgce1: cursor.take(cce1),
+			rgce2: cursor.take(cce2)
+		};
+	} catch (err) {
+		if (!(err instanceof BiffFormatError)) throw err;
+		return;
+	}
+}
+function readCf(record, ranges, formulaSheets) {
+	const parsed = parseCfBytes(record);
+	if (parsed === void 0) return;
+	const { ct, cp, dxfBytes, rgce1, rgce2 } = parsed;
+	if (ct === 2) return;
+	const operator = CP_TO_OPERATOR.get(cp);
+	if (operator === void 0) return;
+	if (rgce1.length === 0) return;
+	try {
 		const formula1 = parseFormulaText(rgce1, formulaSheets);
 		if (formula1 === void 0) return;
 		return {
 			operator,
 			formula1,
-			formula2: cce2 > 0 ? parseFormulaText(rgce2, formulaSheets) : void 0,
+			formula2: rgce2.length > 0 ? parseFormulaText(rgce2, formulaSheets) : void 0,
 			style: parseDxfStyle(dxfBytes),
 			ranges
 		};
@@ -89,16 +104,20 @@ function readCf(record, ranges, formulaSheets) {
 		return;
 	}
 }
+const DEGRADED_CONDFMT_GROUP = {
+	formats: [],
+	recordsConsumed: 1,
+	nID: 0,
+	ranges: [],
+	rawCfs: []
+};
 function readCondFmtGroup(records, startIndex, formulaSheets) {
 	const condFmt = records[startIndex];
-	if (condFmt === void 0) return {
-		formats: [],
-		recordsConsumed: 1
-	};
+	if (condFmt === void 0) return DEGRADED_CONDFMT_GROUP;
 	try {
 		const cursor = new BlockCursor(condFmt.blocks);
 		const ccf = cursor.u16();
-		cursor.skip(2);
+		const nID = cursor.u16() >>> 1 & 32767;
 		cursor.skip(8);
 		const crefCount = cursor.u16();
 		const ranges = [];
@@ -115,25 +134,29 @@ function readCondFmtGroup(records, startIndex, formulaSheets) {
 			});
 		}
 		const formats = [];
+		const rawCfs = [];
 		for (let offset = 1; offset <= ccf; offset += 1) {
 			const cfRecord = records[startIndex + offset];
-			if (cfRecord?.type !== 433) return {
-				formats: [],
-				recordsConsumed: 1
-			};
+			if (cfRecord?.type !== 433) return DEGRADED_CONDFMT_GROUP;
 			const format = readCf(cfRecord, ranges, formulaSheets);
 			if (format !== void 0) formats.push(format);
+			const parsed = parseCfBytes(cfRecord);
+			rawCfs.push(parsed === void 0 ? void 0 : {
+				ct: parsed.ct,
+				cp: parsed.cp,
+				rgce1: parsed.rgce1
+			});
 		}
 		return {
 			formats,
-			recordsConsumed: 1 + ccf
+			recordsConsumed: 1 + ccf,
+			nID,
+			ranges,
+			rawCfs
 		};
 	} catch (err) {
 		if (!(err instanceof BiffFormatError)) throw err;
-		return {
-			formats: [],
-			recordsConsumed: 1
-		};
+		return DEGRADED_CONDFMT_GROUP;
 	}
 }
 //#endregion

package/dist/workbook/data-validation.d.cts

@@ -1,2 +1,2 @@
-import { n as readDv, t as RawDataValidation } from "../data-validation-lJWM9-AP.cjs";
+import { n as readDv, t as RawDataValidation } from "../data-validation-BgUt8CbE.cjs";
 export { RawDataValidation, readDv };

package/dist/workbook/data-validation.d.ts

@@ -1,2 +1,2 @@
-import { n as readDv, t as RawDataValidation } from "../data-validation-BeYpL3Nb.js";
+import { n as readDv, t as RawDataValidation } from "../data-validation-Cq6iD8lB.js";
 export { RawDataValidation, readDv };

package/dist/workbook/drawing.d.cts

@@ -1,4 +1,4 @@
-import { r as FormulaSheetContext } from "../ptg-CCBbJLZJ.cjs";
+import { r as FormulaSheetContext } from "../ptg-75v7MhaA.cjs";
 import { n as Substream, t as RecordGroup } from "../substreams-XDNgDvRJ.cjs";
 import { BlipImage } from "../drawing/blips.cjs";
 import { RawColumn, RawRow } from "./sheet.cjs";

package/dist/workbook/drawing.d.ts

@@ -1,4 +1,4 @@
-import { r as FormulaSheetContext } from "../ptg-CCBbJLZJ.js";
+import { r as FormulaSheetContext } from "../ptg-75v7MhaA.js";
 import { n as Substream, t as RecordGroup } from "../substreams-CgTHx5kX.js";
 import { BlipImage } from "../drawing/blips.js";
 import { RawColumn, RawRow } from "./sheet.js";

package/dist/workbook/globals-writer.d.cts

@@ -1,4 +1,4 @@
-import { E as XfDecorationFields } from "../xf-colors-mqerVt2O.cjs";
+import { E as XfDecorationFields } from "../xf-colors-aeH9Ax3Q.cjs";
 import { t as PrintNamePlanEntry } from "../print-names-B2OR0fvs.cjs";
 import { Alignment, Color } from "document-schema.js";
 //#region src/workbook/globals-writer.d.ts

package/dist/workbook/globals-writer.d.ts

@@ -1,4 +1,4 @@
-import { E as XfDecorationFields } from "../xf-colors-d3OvRw76.js";
+import { E as XfDecorationFields } from "../xf-colors-kdNsiNYt.js";
 import { t as PrintNamePlanEntry } from "../print-names-BXcmmwVi.js";
 import { Alignment, Color } from "document-schema.js";
 //#region src/workbook/globals-writer.d.ts

package/dist/workbook/globals.d.cts

@@ -1,6 +1,6 @@
-import { a as SheetRange, t as ExternalSheetLabel } from "../ptg-CCBbJLZJ.cjs";
+import { a as SheetRange, t as ExternalSheetLabel } from "../ptg-75v7MhaA.cjs";
 import { t as RecordGroup } from "../substreams-XDNgDvRJ.cjs";
-import { E as XfDecorationFields, w as XfAlignmentFields } from "../xf-colors-mqerVt2O.cjs";
+import { E as XfDecorationFields, w as XfAlignmentFields } from "../xf-colors-aeH9Ax3Q.cjs";
 import { n as SheetPrintNames } from "../print-names-B2OR0fvs.cjs";
 import { Color } from "document-schema.js";
 //#region src/workbook/globals.d.ts

package/dist/workbook/globals.d.ts

@@ -1,6 +1,6 @@
-import { a as SheetRange, t as ExternalSheetLabel } from "../ptg-CCBbJLZJ.js";
+import { a as SheetRange, t as ExternalSheetLabel } from "../ptg-75v7MhaA.js";
 import { t as RecordGroup } from "../substreams-CgTHx5kX.js";
-import { E as XfDecorationFields, w as XfAlignmentFields } from "../xf-colors-d3OvRw76.js";
+import { E as XfDecorationFields, w as XfAlignmentFields } from "../xf-colors-kdNsiNYt.js";
 import { n as SheetPrintNames } from "../print-names-BXcmmwVi.js";
 import { Color } from "document-schema.js";
 //#region src/workbook/globals.d.ts

package/dist/workbook/sheet.cjs

@@ -11,6 +11,7 @@ const require_biff_ptg = require("../biff/ptg.cjs");
 const require_biff_rk = require("../biff/rk.cjs");
 const require_workbook_conditional_format = require("./conditional-format.cjs");
 const require_workbook_conditional_format_12 = require("./conditional-format-12.cjs");
+const require_workbook_conditional_format_ex = require("./conditional-format-ex.cjs");
 const require_workbook_data_validation = require("./data-validation.cjs");
 //#region src/workbook/sheet.ts
 /** Row record flag bits, in the 32-bit field following unused1 ([MS-XLS] 2.4.221). */
@@ -116,6 +117,7 @@ function readSheetRecords(records, sharedStrings, formulaSheets = EMPTY_FORMULA_
 	const dataValidations = [];
 	const conditionalFormats = [];
 	const conditionalFormats12 = [];
+	const legacyCondFmtsByNID = /* @__PURE__ */ new Map();
 	let usedRange;
 	const marginsPt = {};
 	const rowBreaks = [];
@@ -148,6 +150,10 @@ function readSheetRecords(records, sharedStrings, formulaSheets = EMPTY_FORMULA_
 			case 432: {
 				const group = require_workbook_conditional_format.readCondFmtGroup(records, index, formulaSheets);
 				conditionalFormats.push(...group.formats);
+				legacyCondFmtsByNID.set(group.nID, {
+					ranges: group.ranges,
+					cfs: group.rawCfs
+				});
 				index += group.recordsConsumed - 1;
 				break;
 			}
@@ -157,6 +163,11 @@ function readSheetRecords(records, sharedStrings, formulaSheets = EMPTY_FORMULA_
 				index += group.recordsConsumed - 1;
 				break;
 			}
+			case require_biff_record_types.RECORD_CFEX: {
+				const format = require_workbook_conditional_format_ex.readCfEx(record, legacyCondFmtsByNID, formulaSheets);
+				if (format !== void 0) conditionalFormats12.push(format);
+				break;
+			}
 			case 513:
 				cells.push(readBlank(record));
 				break;

package/dist/workbook/sheet.d.cts

@@ -1,9 +1,9 @@
 import { n as SetupFields } from "../print-setup-B_ihDvm5.cjs";
-import { r as FormulaSheetContext } from "../ptg-CCBbJLZJ.cjs";
+import { r as FormulaSheetContext } from "../ptg-75v7MhaA.cjs";
 import { t as RecordGroup } from "../substreams-XDNgDvRJ.cjs";
-import { n as RawConditionalFormat } from "../conditional-format-Bt1vRWgc.cjs";
-import { a as RawConditionalFormat12 } from "../conditional-format-12-CZ43-CR4.cjs";
-import { t as RawDataValidation } from "../data-validation-lJWM9-AP.cjs";
+import { r as RawConditionalFormat } from "../conditional-format-Cth_afMy.cjs";
+import { a as RawConditionalFormat12 } from "../conditional-format-12-D65-ruTq.cjs";
+import { t as RawDataValidation } from "../data-validation-BgUt8CbE.cjs";
 //#region src/workbook/sheet.d.ts
 /** A cell's value as its own record carries it, before number-format classification decides whether a number is really a date, a percentage, or an amount of money. */
 type RawCellValue = {

package/dist/workbook/sheet.d.ts

@@ -1,9 +1,9 @@
 import { n as SetupFields } from "../print-setup-B_ihDvm5.js";
-import { r as FormulaSheetContext } from "../ptg-CCBbJLZJ.js";
+import { r as FormulaSheetContext } from "../ptg-75v7MhaA.js";
 import { t as RecordGroup } from "../substreams-CgTHx5kX.js";
-import { n as RawConditionalFormat } from "../conditional-format-Cqcjnm7O.js";
-import { a as RawConditionalFormat12 } from "../conditional-format-12-Xl52VBCj.js";
-import { t as RawDataValidation } from "../data-validation-BeYpL3Nb.js";
+import { r as RawConditionalFormat } from "../conditional-format-BRMUTRP1.js";
+import { a as RawConditionalFormat12 } from "../conditional-format-12-C3nwy1f8.js";
+import { t as RawDataValidation } from "../data-validation-Cq6iD8lB.js";
 //#region src/workbook/sheet.d.ts
 /** A cell's value as its own record carries it, before number-format classification decides whether a number is really a date, a percentage, or an amount of money. */
 type RawCellValue = {

package/dist/workbook/sheet.js

@@ -1,4 +1,4 @@
-import { RECORD_CONDFMT12 } from "../biff/record-types.js";
+import { RECORD_CFEX, RECORD_CONDFMT12 } from "../biff/record-types.js";
 import { BiffFormatError } from "../biff/records.js";
 import { columnWidthToPoints, inchesToPoints, twipsToPoints } from "../units.js";
 import { unpackSetupFlags } from "../biff/print-setup.js";
@@ -10,6 +10,7 @@ import { parseFormulaText, readPtgExpBase } from "../biff/ptg.js";
 import { decodeRkNumber } from "../biff/rk.js";
 import { readCondFmtGroup } from "./conditional-format.js";
 import { readCondFmt12Group } from "./conditional-format-12.js";
+import { readCfEx } from "./conditional-format-ex.js";
 import { readDv } from "./data-validation.js";
 //#region src/workbook/sheet.ts
 /** Row record flag bits, in the 32-bit field following unused1 ([MS-XLS] 2.4.221). */
@@ -115,6 +116,7 @@ function readSheetRecords(records, sharedStrings, formulaSheets = EMPTY_FORMULA_
 	const dataValidations = [];
 	const conditionalFormats = [];
 	const conditionalFormats12 = [];
+	const legacyCondFmtsByNID = /* @__PURE__ */ new Map();
 	let usedRange;
 	const marginsPt = {};
 	const rowBreaks = [];
@@ -147,6 +149,10 @@ function readSheetRecords(records, sharedStrings, formulaSheets = EMPTY_FORMULA_
 			case 432: {
 				const group = readCondFmtGroup(records, index, formulaSheets);
 				conditionalFormats.push(...group.formats);
+				legacyCondFmtsByNID.set(group.nID, {
+					ranges: group.ranges,
+					cfs: group.rawCfs
+				});
 				index += group.recordsConsumed - 1;
 				break;
 			}
@@ -156,6 +162,11 @@ function readSheetRecords(records, sharedStrings, formulaSheets = EMPTY_FORMULA_
 				index += group.recordsConsumed - 1;
 				break;
 			}
+			case RECORD_CFEX: {
+				const format = readCfEx(record, legacyCondFmtsByNID, formulaSheets);
+				if (format !== void 0) conditionalFormats12.push(format);
+				break;
+			}
 			case 513:
 				cells.push(readBlank(record));
 				break;

package/dist/{xf-colors-mqerVt2O.d.cts → xf-colors-aeH9Ax3Q.d.cts}

@@ -1,4 +1,4 @@
-import { t as BlockCursor } from "./cursor-VMtw9uVP.cjs";
+import { t as BlockCursor } from "./cursor-CnEuX5qE.cjs";
 import { Alignment, Color, ContentBorder, ContentCellFill, ContentCellPatternType } from "document-schema.js";
 //#region src/biff/xf-colors.d.ts
 /** FLSNULL: no fill pattern -- the cell's fill colour fields carry no meaning. */

package/dist/{xf-colors-d3OvRw76.d.ts → xf-colors-kdNsiNYt.d.ts}

@@ -1,4 +1,4 @@
-import { t as BlockCursor } from "./cursor-VMtw9uVP.js";
+import { t as BlockCursor } from "./cursor-CnEuX5qE.js";
 import { Alignment, Color, ContentBorder, ContentCellFill, ContentCellPatternType } from "document-schema.js";
 //#region src/biff/xf-colors.d.ts
 /** FLSNULL: no fill pattern -- the cell's fill colour fields carry no meaning. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xls-codec",
-  "version": "4.8.0",
+  "version": "4.9.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": {

package/dist/conditional-format-Bt1vRWgc.d.cts

@@ -1,29 +0,0 @@
-import { r as FormulaSheetContext } from "./ptg-CCBbJLZJ.cjs";
-import { t as RecordGroup } from "./substreams-XDNgDvRJ.cjs";
-import { ContentSheetRange, SheetRuleOperator } from "document-schema.js";
-//#region src/workbook/conditional-format.d.ts
-interface RawConditionalFormatFill {
-  readonly fillPattern: number;
-  readonly fillForegroundIcv: number;
-  readonly fillBackgroundIcv: number;
-}
-interface RawConditionalFormatStyle {
-  readonly fontColorIcv: number | undefined;
-  readonly fill: RawConditionalFormatFill | undefined;
-}
-interface RawConditionalFormat {
-  readonly operator: SheetRuleOperator;
-  readonly formula1: string;
-  readonly formula2: string | undefined;
-  readonly style: RawConditionalFormatStyle | undefined;
-  readonly ranges: ContentSheetRange[];
-}
-declare function parseDxfStyle(dxfBytes: Uint8Array<ArrayBuffer>): RawConditionalFormatStyle | undefined;
-interface CondFmtGroupResult {
-  readonly formats: RawConditionalFormat[];
-  /** How many records (the CondFmt itself plus every CF it claimed) the caller should advance past, regardless of how many rules actually promoted. */
-  readonly recordsConsumed: number;
-}
-declare function readCondFmtGroup(records: readonly RecordGroup[], startIndex: number, formulaSheets: FormulaSheetContext): CondFmtGroupResult;
-//#endregion
-export { parseDxfStyle as a, RawConditionalFormatStyle as i, RawConditionalFormat as n, readCondFmtGroup as o, RawConditionalFormatFill as r, CondFmtGroupResult as t };

package/dist/conditional-format-Cqcjnm7O.d.ts

@@ -1,29 +0,0 @@
-import { r as FormulaSheetContext } from "./ptg-CCBbJLZJ.js";
-import { t as RecordGroup } from "./substreams-CgTHx5kX.js";
-import { ContentSheetRange, SheetRuleOperator } from "document-schema.js";
-//#region src/workbook/conditional-format.d.ts
-interface RawConditionalFormatFill {
-  readonly fillPattern: number;
-  readonly fillForegroundIcv: number;
-  readonly fillBackgroundIcv: number;
-}
-interface RawConditionalFormatStyle {
-  readonly fontColorIcv: number | undefined;
-  readonly fill: RawConditionalFormatFill | undefined;
-}
-interface RawConditionalFormat {
-  readonly operator: SheetRuleOperator;
-  readonly formula1: string;
-  readonly formula2: string | undefined;
-  readonly style: RawConditionalFormatStyle | undefined;
-  readonly ranges: ContentSheetRange[];
-}
-declare function parseDxfStyle(dxfBytes: Uint8Array<ArrayBuffer>): RawConditionalFormatStyle | undefined;
-interface CondFmtGroupResult {
-  readonly formats: RawConditionalFormat[];
-  /** How many records (the CondFmt itself plus every CF it claimed) the caller should advance past, regardless of how many rules actually promoted. */
-  readonly recordsConsumed: number;
-}
-declare function readCondFmtGroup(records: readonly RecordGroup[], startIndex: number, formulaSheets: FormulaSheetContext): CondFmtGroupResult;
-//#endregion
-export { parseDxfStyle as a, RawConditionalFormatStyle as i, RawConditionalFormat as n, readCondFmtGroup as o, RawConditionalFormatFill as r, CondFmtGroupResult as t };