@xlsxflow/core 1.1.1 → 1.1.3

package/dist/index.d.cts

@@ -372,6 +372,7 @@ interface WorkbookParts {
 declare function resolveWorkbookParts(readText: (path: string) => Promise<string>): Promise<WorkbookParts>;
 declare function partRelationships(readText: (path: string) => Promise<string>, partPath: string): Promise<Relationship[]>;
 declare function decodeXString(s: string): string;
+declare function checkCellText(s: string, ref: string): string;
 declare function colIndex(ref: string): number;
 declare function colLetter(index: number): string;
 type RefRole = 'single' | 'start' | 'end';
@@ -579,6 +580,28 @@ declare class CfbReader {
     read(path: string): Uint8Array | undefined;
 }
 
+declare class StylePatcher {
+    private xml;
+    private p;
+    private fonts;
+    private fills;
+    private borders;
+    private xfs;
+    private numFmts;
+    private nextNumFmt;
+    private added;
+    private memo;
+    constructor(xml: string);
+    get changed(): boolean;
+    patch(base: number, style: CellStyle): number;
+    dateFormat(base: number, d: Date): number;
+    toXml(): string;
+    private existing;
+    private add;
+    private items;
+    private prefix;
+}
+
 type Placement = {
     range: string;
 } | {
@@ -597,5 +620,5 @@ declare const XlsxFlow: {
     readFile(filePath: string, options?: ParseOptions): Promise<ParseResult>;
 };
 
-export { CfbReader, ConditionalFormatter, DRAWING_NS, FormulaEngine, OdsWriter, SheetEditor, SheetReader, SheetWriter, StyleEngine, XlsxFlow, ZipRandomAccessParser, ZipStreamWriter, anchorXml, colIndex, colLetter, crc32, createBlobReader, createFileReader, createXmlStreamParser, dateToSerial, decodeXString, drawingPartXml, encodeXString, isCfb, legacyPasswordHash, mapFormulaRefs, parseCsv, parseWorksheet, partRelationships, readSharedStrings, recalcOnOpen, resolveWorkbookParts, sheetToJson, shiftFormula, streamToCsv };
+export { CfbReader, ConditionalFormatter, DRAWING_NS, FormulaEngine, OdsWriter, SheetEditor, SheetReader, SheetWriter, StyleEngine, StylePatcher, XlsxFlow, ZipRandomAccessParser, ZipStreamWriter, anchorXml, checkCellText, colIndex, colLetter, crc32, createBlobReader, createFileReader, createXmlStreamParser, dateToSerial, decodeXString, drawingPartXml, encodeXString, isCfb, legacyPasswordHash, mapFormulaRefs, parseCsv, parseWorksheet, partRelationships, readSharedStrings, recalcOnOpen, resolveWorkbookParts, sheetToJson, shiftFormula, streamToCsv };
 export type { BorderSide, CellAlignment, CellBorder, CellComment, CellEdit, CellFill, CellFont, CellStyle, CellValue$1 as CellValue, CfbEntry, ColumnOptions, ComparisonOperator, ConditionalFormat, ConditionalFormatRule, CsvOptions, DataValidation, DefinedName, GradientFill, HighlightStyle, OdsSheetOptions, OdsWriterOptions, PageSetup, ParseOptions, Placement, RandomAccessReader, RefMapper, RefRole, Relationship, RichTextRun, Row, RowData, RowOptions, SheetComment, SheetImage, SheetMetadata, SheetOptions, SheetProtection, SheetView, StyledCell, TableOptions, WorkbookInfo, WorkbookParts, WorkbookProperties, WriterOptions };

package/dist/index.d.ts

@@ -372,6 +372,7 @@ interface WorkbookParts {
 declare function resolveWorkbookParts(readText: (path: string) => Promise<string>): Promise<WorkbookParts>;
 declare function partRelationships(readText: (path: string) => Promise<string>, partPath: string): Promise<Relationship[]>;
 declare function decodeXString(s: string): string;
+declare function checkCellText(s: string, ref: string): string;
 declare function colIndex(ref: string): number;
 declare function colLetter(index: number): string;
 type RefRole = 'single' | 'start' | 'end';
@@ -579,6 +580,28 @@ declare class CfbReader {
     read(path: string): Uint8Array | undefined;
 }
 
+declare class StylePatcher {
+    private xml;
+    private p;
+    private fonts;
+    private fills;
+    private borders;
+    private xfs;
+    private numFmts;
+    private nextNumFmt;
+    private added;
+    private memo;
+    constructor(xml: string);
+    get changed(): boolean;
+    patch(base: number, style: CellStyle): number;
+    dateFormat(base: number, d: Date): number;
+    toXml(): string;
+    private existing;
+    private add;
+    private items;
+    private prefix;
+}
+
 type Placement = {
     range: string;
 } | {
@@ -597,5 +620,5 @@ declare const XlsxFlow: {
     readFile(filePath: string, options?: ParseOptions): Promise<ParseResult>;
 };
 
-export { CfbReader, ConditionalFormatter, DRAWING_NS, FormulaEngine, OdsWriter, SheetEditor, SheetReader, SheetWriter, StyleEngine, XlsxFlow, ZipRandomAccessParser, ZipStreamWriter, anchorXml, colIndex, colLetter, crc32, createBlobReader, createFileReader, createXmlStreamParser, dateToSerial, decodeXString, drawingPartXml, encodeXString, isCfb, legacyPasswordHash, mapFormulaRefs, parseCsv, parseWorksheet, partRelationships, readSharedStrings, recalcOnOpen, resolveWorkbookParts, sheetToJson, shiftFormula, streamToCsv };
+export { CfbReader, ConditionalFormatter, DRAWING_NS, FormulaEngine, OdsWriter, SheetEditor, SheetReader, SheetWriter, StyleEngine, StylePatcher, XlsxFlow, ZipRandomAccessParser, ZipStreamWriter, anchorXml, checkCellText, colIndex, colLetter, crc32, createBlobReader, createFileReader, createXmlStreamParser, dateToSerial, decodeXString, drawingPartXml, encodeXString, isCfb, legacyPasswordHash, mapFormulaRefs, parseCsv, parseWorksheet, partRelationships, readSharedStrings, recalcOnOpen, resolveWorkbookParts, sheetToJson, shiftFormula, streamToCsv };
 export type { BorderSide, CellAlignment, CellBorder, CellComment, CellEdit, CellFill, CellFont, CellStyle, CellValue$1 as CellValue, CfbEntry, ColumnOptions, ComparisonOperator, ConditionalFormat, ConditionalFormatRule, CsvOptions, DataValidation, DefinedName, GradientFill, HighlightStyle, OdsSheetOptions, OdsWriterOptions, PageSetup, ParseOptions, Placement, RandomAccessReader, RefMapper, RefRole, Relationship, RichTextRun, Row, RowData, RowOptions, SheetComment, SheetImage, SheetMetadata, SheetOptions, SheetProtection, SheetView, StyledCell, TableOptions, WorkbookInfo, WorkbookParts, WorkbookProperties, WriterOptions };

package/dist/index.mjs

@@ -348,7 +348,16 @@ async function sheetToJson(parseResult, headerRowIndex = 0) {
         if (skip-- > 0)
             continue;
         if (headers.length === 0) {
-            headers = row.cells.map((c, i) => (c !== null && c !== undefined ? String(c) : `Column${i + 1}`));
+            const seen = new Set();
+            headers = row.cells.map((c, i) => {
+                const base = c !== null && c !== undefined ? String(c) : `Column${i + 1}`;
+                // A repeated header gets a suffix ("Name_2") so its column isn't lost
+                let name = base;
+                for (let n = 2; seen.has(name); n++)
+                    name = `${base}_${n}`;
+                seen.add(name);
+                return name;
+            });
             continue;
         }
         const obj = {};
@@ -453,6 +462,21 @@ function decodeXString(s) {
 // Excel's sheet size (A..XFD, 1..1048576)
 const MAX_COLUMNS$1 = 16384;
 const MAX_ROWS$1 = 1048576;
+// Excel's limit on the characters in one cell
+const MAX_CELL_TEXT = 32767;
+function checkCellText(s, ref) {
+    if (s.length > MAX_CELL_TEXT)
+        throw new Error(`Cell ${ref} has ${s.length} characters, more than Excel's ${MAX_CELL_TEXT}.`);
+    return s;
+}
+// Colours are ARGB hex ("FFFF0000"); "FF0000" and "#FF0000" get an opaque alpha. Anything else
+// makes Excel repair the file.
+function argb(c) {
+    const m = /^#?([0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$/.exec(String(c));
+    if (!m)
+        throw new Error(`Invalid colour "${c}": use ARGB hex such as "FFFF0000".`);
+    return (m[1].length === 6 ? 'FF' + m[1] : m[1]).toUpperCase();
+}
 // 0-based column of letters like "BC" (or a reference like "BC12"); -1 when there are none
 function colIndex(ref) {
     const match = ref.match(/[A-Za-z]+/);
@@ -552,6 +576,8 @@ function encodeXString(s) {
         .replace(/_(?=x[0-9A-Fa-f]{4}_)/g, '_x005F_')
         .replace(/[\x00-\x08\x0B\x0C\r\x0E-\x1F]/g, c => `_x${c.charCodeAt(0).toString(16).toUpperCase().padStart(4, '0')}_`);
 }
+// The format SheetWriter gives a date without one: the time only when there is one
+const defaultDateFormat = (d) => d.getTime() % 86400000 === 0 ? 'yyyy-mm-dd' : 'yyyy-mm-dd hh:mm:ss';
 // True when a number format renders dates/times. Ignores quoted text, escapes, colours and
 // locale tags, so "0 \"days\"", "[Red]0.0" and "#,##0 \"USD\"" are not mistaken for dates.
 function isDateFormatCode(code) {
@@ -1448,7 +1474,8 @@ function parseWorksheet(xmlTokenStream, sharedStrings, styles, is1904 = false, o
                                 }
                                 else if (currentCellType === 's') {
                                     const index = parseInt(currentCellValue, 10);
-                                    resolvedValue = sharedStrings.get(index) ?? currentCellValue;
+                                    // An index past the table points nowhere: the cell is empty
+                                    resolvedValue = sharedStrings.get(index) ?? null;
                                 }
                                 else if (currentCellType === 'b') {
                                     resolvedValue = currentCellValue === '1' || currentCellValue === 'true';
@@ -1622,9 +1649,10 @@ async function readSheetImages(readText, readBytes, sheetPath) {
 const escapeXml$4 = (s) => s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 const cellPos = (ref) => {
     const m = /^\$?([A-Za-z]{1,3})\$?(\d+)$/.exec(ref.trim());
-    if (!m)
+    const col = m ? colIndex(m[1]) : -1, row = m ? parseInt(m[2], 10) - 1 : -1;
+    if (col < 0 || col >= MAX_COLUMNS$1 || row < 0 || row >= MAX_ROWS$1)
         throw new Error(`Invalid anchor cell "${ref}".`);
-    return { col: colIndex(m[1]), row: parseInt(m[2], 10) - 1 };
+    return { col, row };
 };
 const marker = (tag, { col, row }) => `<xdr:${tag}><xdr:col>${col}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${row}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:${tag}>`;
 const DRAWING_NS = 'xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" ' +
@@ -1636,9 +1664,11 @@ const DRAWING_NS = 'xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/
 function anchorXml(place, natural, body, attrs = '') {
     if ('range' in place) {
         const [from, to = from] = place.range.split(':');
-        const end = cellPos(to);
-        // The object fills the range: it ends at the far edge of the last cell
-        return `<xdr:twoCellAnchor editAs="oneCell"${attrs}>${marker('from', cellPos(from))}${marker('to', { col: end.col + 1, row: end.row + 1 })}${body}<xdr:clientData/></xdr:twoCellAnchor>`;
+        const a = cellPos(from), b = cellPos(to);
+        // The object fills the range, given either way round: it ends at the far edge of the last cell
+        const start = { col: Math.min(a.col, b.col), row: Math.min(a.row, b.row) };
+        const end = { col: Math.max(a.col, b.col) + 1, row: Math.max(a.row, b.row) + 1 };
+        return `<xdr:twoCellAnchor editAs="oneCell"${attrs}>${marker('from', start)}${marker('to', end)}${body}<xdr:clientData/></xdr:twoCellAnchor>`;
     }
     const { width: w, height: h } = natural;
     const width = place.width ?? (place.height ? w * place.height / h : w);
@@ -2623,22 +2653,22 @@ function fontXml(font, nameTag = 'name') {
     if (font.size)
         xml += `<sz val="${escapeXml$3(font.size)}"/>`;
     if (font.color)
-        xml += `<color rgb="${escapeXml$3(font.color)}"/>`;
+        xml += `<color rgb="${argb(font.color)}"/>`;
     if (font.name)
         xml += `<${nameTag} val="${escapeXml$3(font.name)}"/>`;
     return xml;
 }
-const borderSideXml = (tag, s) => s ? `<${tag} style="${escapeXml$3(s.style)}">${s.color ? `<color rgb="${escapeXml$3(s.color)}"/>` : ''}</${tag}>` : `<${tag}/>`;
+const borderSideXml = (tag, s) => s ? `<${tag} style="${escapeXml$3(s.style)}">${s.color ? `<color rgb="${argb(s.color)}"/>` : ''}</${tag}>` : `<${tag}/>`;
 function borderXml(b) {
     const side = borderSideXml;
     return `<border>${side('left', b.left)}${side('right', b.right)}${side('top', b.top)}${side('bottom', b.bottom)}<diagonal/></border>`;
 }
 function fillXml(fill) {
     if (fill.type === 'gradient') {
-        const stops = fill.stops.map(s => `<stop position="${s.position}"><color rgb="${escapeXml$3(s.color)}"/></stop>`).join('');
+        const stops = fill.stops.map(s => `<stop position="${s.position}"><color rgb="${argb(s.color)}"/></stop>`).join('');
         return `<fill><gradientFill degree="${escapeXml$3(fill.degree ?? 0)}">${stops}</gradientFill></fill>`;
     }
-    return `<fill><patternFill patternType="solid"><fgColor rgb="${escapeXml$3(fill.fgColor)}"/></patternFill></fill>`;
+    return `<fill><patternFill patternType="solid"><fgColor rgb="${argb(fill.fgColor)}"/></patternFill></fill>`;
 }
 // Attributes of an <alignment> element
 function alignmentAttrs(alignment) {
@@ -2680,7 +2710,7 @@ class StyleEngine {
             xml += `<numFmt numFmtId="${this.registerNumFmt(style.numFmt)}" formatCode="${escapeXml$3(style.numFmt)}"/>`;
         if (style.fill?.type === 'solid') {
             // A differential solid fill takes its colour from bgColor
-            const c = escapeXml$3(style.fill.fgColor);
+            const c = argb(style.fill.fgColor);
             xml += `<fill><patternFill patternType="solid"><fgColor rgb="${c}"/><bgColor rgb="${c}"/></patternFill></fill>`;
         }
         if (style.border)
@@ -2808,7 +2838,7 @@ ${this.dxfs.size ? `<dxfs count="${this.dxfs.size}">${[...this.dxfs.keys()].map(
 function escapeXml$2(val) {
     return String(val).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 }
-const color = (rgb) => `<color rgb="${escapeXml$2(rgb)}"/>`;
+const color = (rgb) => `<color rgb="${argb(rgb)}"/>`;
 const bound = (type, value) => value === undefined ? `<cfvo type="${type}"/>` : `<cfvo type="num" val="${escapeXml$2(value)}"/>`;
 const formula = (f) => `<formula>${escapeXml$2(String(f).replace(/^=/, ''))}</formula>`;
 // Excel string literal inside a formula
@@ -3360,7 +3390,6 @@ function escapeXml$1(val) {
 function isStyledCell$1(v) {
     return typeof v === 'object' && v !== null && 'value' in v;
 }
-const DAY_MS = 86400000;
 // "A1:C10" -> "$A$1:$C$10"
 const absoluteRef = (ref) => ref.replace(/([A-Za-z]+)(\d+)/g, '$$$1$$$2');
 function stringXml(s) {
@@ -3638,7 +3667,7 @@ class SheetWriter {
         const page = options.pageSetup;
         const fitToPage = page && (page.fitToWidth !== undefined || page.fitToHeight !== undefined);
         const sheetPr = options.tabColor || fitToPage
-            ? `<sheetPr>${options.tabColor ? `<tabColor rgb="${escapeXml$1(options.tabColor)}"/>` : ''}${fitToPage ? '<pageSetUpPr fitToPage="1"/>' : ''}</sheetPr>`
+            ? `<sheetPr>${options.tabColor ? `<tabColor rgb="${argb(options.tabColor)}"/>` : ''}${fitToPage ? '<pageSetUpPr fitToPage="1"/>' : ''}</sheetPr>`
             : '';
         const sheetFormatPr = outlineRow || outlineCol
             ? `<sheetFormatPr defaultRowHeight="15"${outlineRow ? ` outlineLevelRow="${outlineRow}"` : ''}${outlineCol ? ` outlineLevelCol="${outlineCol}"` : ''}/>`
@@ -3676,6 +3705,11 @@ class SheetWriter {
             if (done)
                 break;
             const rowNum = ri + 1;
+            // Past Excel's sheet size the file is damaged, so refuse it instead
+            if (rowNum > MAX_ROWS$1)
+                throw new Error(`Row ${rowNum} is past Excel's last row (${MAX_ROWS$1}).`);
+            if (row.length > MAX_COLUMNS$1)
+                throw new Error(`Row ${rowNum} has ${row.length} cells, more than Excel's ${MAX_COLUMNS$1} columns.`);
             chunkStr += optionRowsBefore(rowNum);
             if (rowOptions[nextRowOption]?.[0] === rowNum)
                 nextRowOption++;
@@ -3686,7 +3720,7 @@ class SheetWriter {
                 let cellStyle = styledCell.style;
                 if (val instanceof Date && !cellStyle?.numFmt) {
                     // A date needs a date format, or Excel shows the bare serial number
-                    cellStyle = { ...cellStyle, numFmt: val.getTime() % DAY_MS === 0 ? 'yyyy-mm-dd' : 'yyyy-mm-dd hh:mm:ss' };
+                    cellStyle = { ...cellStyle, numFmt: defaultDateFormat(val) };
                 }
                 const style = cellStyle ? this.styleEngine.registerStyle(cellStyle) : 0;
                 const sAttr = style > 0 ? ` s="${style}"` : '';
@@ -3737,6 +3771,7 @@ class SheetWriter {
                     return `<c r="${colRef}"${sAttr}><v>${dateToSerial(val)}</v></c>`;
                 }
                 if (typeof val === 'string') {
+                    checkCellText(val, colRef);
                     if (this.writerOptions.sharedStrings) {
                         let index = this.sharedStrings.get(val);
                         if (index === undefined)
@@ -4142,6 +4177,16 @@ class StylePatcher {
         this.memo.set(key, id);
         return id;
     }
+    // The format for date `d` in a cell of format `base`: `base` when it already shows dates, otherwise
+    // `base` with a date format, since a date in a General cell shows as its serial number
+    dateFormat(base, d) {
+        const xf = this.xfs[base] ?? this.added.cellXfs[base - this.xfs.length] ?? '';
+        const id = parseInt(attr(/^<[^>]*>/.exec(xf)?.[0] ?? '', 'numFmtId') ?? '0', 10);
+        const code = [...this.numFmts].find(([, v]) => v === id)?.[0];
+        if (isBuiltinDateFormat(id) || (code !== undefined && isDateFormatCode(code)))
+            return base;
+        return this.patch(base, { numFmt: defaultDateFormat(d) });
+    }
     toXml() {
         let xml = this.xml;
         for (const section of ['numFmts', 'fonts', 'fills', 'borders', 'cellXfs']) {
@@ -4697,7 +4742,7 @@ function editedCell(p, ref, attrs, edit) {
     }
     if (typeof edit === 'object')
         return `<${p}c r="${ref}"${attrs}><${p}f>${escapeXml$5(edit.formula.replace(/^=/, ''))}</${p}f></${p}c>`;
-    const text = escapeXml$5(encodeXString(edit));
+    const text = escapeXml$5(encodeXString(checkCellText(edit, ref)));
     const t = /^\s|\s$/.test(edit) ? `<${p}t xml:space="preserve">${text}</${p}t>` : `<${p}t>${text}</${p}t>`;
     return `<${p}c r="${ref}"${attrs} t="inlineStr"><${p}is>${t}</${p}is></${p}c>`;
 }
@@ -4748,9 +4793,9 @@ class SheetEditor {
             this.cellEdits.set(sheetName, rows = new Map());
         for (const [ref, edit] of Object.entries(cells)) {
             const m = /^\$?([A-Za-z]{1,3})\$?(\d+)$/.exec(ref);
-            if (!m || parseInt(m[2], 10) < 1)
+            const r = m ? parseInt(m[2], 10) : 0;
+            if (!m || r < 1 || r > MAX_ROWS$1 || colIndex(m[1]) >= MAX_COLUMNS$1)
                 throw new Error(`Invalid cell reference "${ref}".`);
-            const r = parseInt(m[2], 10);
             if (!rows.has(r))
                 rows.set(r, new Map());
             rows.get(r).set(colIndex(m[1]), edit);
@@ -4936,7 +4981,10 @@ class SheetEditor {
                 let patcher;
                 const styled = [...editsByPath.values(), ...added.values()]
                     .some(rows => [...rows.values()].some(cells => [...cells.values()].some(e => styleOf(e))));
-                if (styled) {
+                // Dates may need a date format added to their cells
+                const dated = [...editsByPath.values(), ...added.values()]
+                    .some(rows => [...rows.values()].some(cells => [...cells.values()].some(e => contentOf(e) instanceof Date)));
+                if (styled || (dated && parts.styles)) {
                     if (!parts.styles)
                         throw new Error('Workbook has no styles part.');
                     patcher = new StylePatcher(await read(parts.styles));
@@ -5013,6 +5061,10 @@ class SheetEditor {
                 attrs = `${attrs.replace(/\ss="[^"]*"/, '')} s="${patcher.patch(base, style)}"`;
             }
             const content = contentOf(edit);
+            if (content instanceof Date && patcher) {
+                const base = parseInt(/\ss="(\d+)"/.exec(attrs)?.[1] ?? '0', 10);
+                attrs = `${attrs.replace(/\ss="[^"]*"/, '')} s="${patcher.dateFormat(base, content)}"`;
+            }
             if (content === KEEP) {
                 return existing?.[2] !== undefined ? `<${p}c r="${ref}"${attrs}>${existing[2]}</${p}c>` : `<${p}c r="${ref}"${attrs}/>`;
             }
@@ -5162,7 +5214,7 @@ class SheetEditor {
                 if (typeof val === 'number')
                     return `<c r="${colRef}"><v>${val}</v></c>`;
                 if (typeof val === 'string') {
-                    return `<c r="${colRef}" t="inlineStr"><is><t xml:space="preserve">${escapeXml$5(encodeXString(val))}</t></is></c>`;
+                    return `<c r="${colRef}" t="inlineStr"><is><t xml:space="preserve">${escapeXml$5(encodeXString(checkCellText(val, colRef)))}</t></is></c>`;
                 }
                 return `<c r="${colRef}"/>`;
             }).join('');
@@ -5774,7 +5826,8 @@ async function* parseCsv(input, options = {}) {
     let first = true;
     const rows = [];
     const endField = () => {
-        row.push(quoted || !convert ? field : convertField(field));
+        // An empty unquoted field is null in both modes; a quoted "" stays an empty string
+        row.push(quoted ? field : !convert ? (field === '' ? null : field) : convertField(field));
         field = '';
         quoted = false;
     };
@@ -5906,11 +5959,14 @@ function textXml(s) {
 }
 const dateValue = (d) => d.toISOString().slice(0, 19); // UTC, like SheetWriter
 const hasTime = (d) => d.getTime() % 86400000 !== 0;
-function cellXml(cell, span, covered) {
+function cellXml(cell, span, covered, evaluate) {
     if (covered)
         return '<table:covered-table-cell/>';
-    const value = isStyledCell(cell) ? cell.value : cell;
+    let value = isStyledCell(cell) ? cell.value : cell;
     const formula = isStyledCell(cell) && cell.formula ? ` table:formula="${escapeXml(toOpenFormula(cell.formula))}"` : '';
+    // A formula without a value gets its result stored, as SheetWriter does, for readers that don't recalculate
+    if (formula && value == null)
+        value = evaluate(cell.formula);
     if (value === null || value === undefined || (typeof value === 'number' && !isFinite(value))) {
         return formula || span ? `<table:table-cell${formula}${span}/>` : '<table:table-cell/>';
     }
@@ -6003,6 +6059,15 @@ class OdsWriter {
                 const merges = (sheet.options.mergeCells ?? []).map(parseRange);
                 const lastMergeRow = Math.max(-1, ...merges.map(m => m.r2));
                 const mergeAt = (r, c) => merges.find(m => m.r1 === r && m.c1 === c);
+                // Formulas resolve against the sheet they live in; streamed rows can't be looked back at
+                const engine = new FormulaEngine();
+                if (Array.isArray(sheet.rows)) {
+                    engine.loadData(sheet.rows.map(row => row.map(cell => {
+                        const v = isStyledCell(cell) ? cell.value : cell;
+                        return v instanceof Date ? dateToSerial(v) : v ?? null;
+                    })));
+                }
+                const evaluate = (f) => engine.evaluate(f);
                 const covered = (r, c) => merges.some(m => r >= m.r1 && r <= m.r2 && c >= m.c1 && c <= m.c2 && (r !== m.r1 || c !== m.c1));
                 let r = 0, batch = '';
                 const writeRow = (row) => {
@@ -6011,7 +6076,7 @@ class OdsWriter {
                     for (let c = 0; c < width; c++) {
                         const m = mergeAt(r, c);
                         const span = m ? ` table:number-columns-spanned="${m.c2 - m.c1 + 1}" table:number-rows-spanned="${m.r2 - m.r1 + 1}"` : '';
-                        xml += cellXml(row[c], span, covered(r, c));
+                        xml += cellXml(row[c], span, covered(r, c), evaluate);
                     }
                     r++;
                     return xml + (width ? '' : '<table:table-cell/>') + '</table:table-row>';
@@ -6095,5 +6160,5 @@ const XlsxFlow = {
     }
 };
 
-export { CfbReader, ConditionalFormatter, DRAWING_NS, FormulaEngine, OdsWriter, SheetEditor, SheetReader, SheetWriter, StyleEngine, XlsxFlow, ZipRandomAccessParser, ZipStreamWriter, anchorXml, colIndex, colLetter, crc32, createBlobReader, createFileReader, createXmlStreamParser, dateToSerial, decodeXString, drawingPartXml, encodeXString, isCfb, legacyPasswordHash, mapFormulaRefs, parseCsv, parseWorksheet, partRelationships, readSharedStrings, recalcOnOpen, resolveWorkbookParts, sheetToJson, shiftFormula, streamToCsv };
+export { CfbReader, ConditionalFormatter, DRAWING_NS, FormulaEngine, OdsWriter, SheetEditor, SheetReader, SheetWriter, StyleEngine, StylePatcher, XlsxFlow, ZipRandomAccessParser, ZipStreamWriter, anchorXml, checkCellText, colIndex, colLetter, crc32, createBlobReader, createFileReader, createXmlStreamParser, dateToSerial, decodeXString, drawingPartXml, encodeXString, isCfb, legacyPasswordHash, mapFormulaRefs, parseCsv, parseWorksheet, partRelationships, readSharedStrings, recalcOnOpen, resolveWorkbookParts, sheetToJson, shiftFormula, streamToCsv };
 //# sourceMappingURL=index.mjs.map