@xlsxflow/core 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.1.2
+
+### Fixed
+
+- `SheetWriter` throws an error for a row longer than 16,384 cells or past row 1,048,576, instead of writing a file Excel reports as damaged.
+- `SheetEditor.setCells`: a date in a cell without a date format gets `yyyy-mm-dd` (or `yyyy-mm-dd hh:mm:ss` with a time), as in `SheetWriter`, instead of showing as a serial number.
+- `OdsWriter` stores formula results, so readers that don't recalculate show them.
+- `sheetToJson` keeps every column when headers repeat: the second `Name` becomes `Name_2`.
+- `parseCsv` returns `null` for empty unquoted fields with `{ convert: false }` too.
+
+### Added
+
+- `StylePatcher` is exported, for `@xlsxflow/pro`.
+
 ## 1.1.1
 
 - README: the XlsxFlow website address, and Pro at a flat $5.

package/README.md

@@ -83,7 +83,7 @@ Parts held in memory (workbook, shared strings, styles) are capped at 1 GiB unco
 
 **Reading files from untrusted users** (uploads on a server): set `maxUncompressedBytes` to what you expect, such as `50_000_000`. Corrupt or crafted ZIPs (overlapping entries, entries that inflate past their stated size, directories pointing outside the file) are rejected either way. The limit also bounds the empty cells added before far-right cells, since one tiny cell in column XFD pads its row to 16,384 values. Values are returned as written: hyperlinks may be `javascript:` URLs and text may start with `=`, so check them before putting them in a web page or a CSV that a spreadsheet will open.
 
-`sheetToJson(rows, headerRowIndex = 0)` turns the rows into objects keyed by the header row, and `streamToCsv(rows)` returns the sheet as CSV text. Both hold the whole result in memory.
+`sheetToJson(rows, headerRowIndex = 0)` turns the rows into objects keyed by the header row (a repeated header gets a suffix: `Name`, `Name_2`), and `streamToCsv(rows)` returns the sheet as CSV text. Both hold the whole result in memory.
 
 In Node.js, read straight from disk with `XlsxFlow.readFile`, or pass `await createFileReader(path)` to any function that takes a reader:
 
@@ -140,7 +140,7 @@ import { SheetWriter, parseCsv } from '@xlsxflow/core';
 const xlsx = new SheetWriter().addSheet('Data', parseCsv(csvStream)).write();
 ```
 
-Quoted fields can hold delimiters, line breaks and `""`. Unquoted numbers and `TRUE`/`FALSE` become numbers and booleans, and empty fields become empty cells; `{ convert: false }` keeps everything as text, and `{ delimiter: ';' }` sets the delimiter. Dates stay text, since CSV files do not say which date order they use.
+Quoted fields can hold delimiters, line breaks and `""`. Unquoted numbers and `TRUE`/`FALSE` become numbers and booleans, and empty fields become empty cells (`null`; a quoted `""` stays an empty string); `{ convert: false }` keeps everything else as text, and `{ delimiter: ';' }` sets the delimiter. Dates stay text, since CSV files do not say which date order they use.
 
 ### .xls and .ods Files
 
@@ -158,7 +158,7 @@ and document properties. `formatted: true` works on both; `formulas: true` works
   [`@xlsxflow/pro`](#free-and-pro).
 
 `OdsWriter` writes `.ods` with the same rows as `SheetWriter`: values, dates, formulas (converted to
-OpenFormula), merged cells, column widths, frozen panes, hidden sheets and document properties. Cell styles,
+OpenFormula, with their results), merged cells, column widths, frozen panes, hidden sheets and document properties. Cell styles,
 hyperlinks, notes and images are not written to `.ods`.
 
 ```typescript

package/dist/index.cjs

@@ -350,7 +350,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 = {};
@@ -554,6 +563,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) {
@@ -3362,7 +3373,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) {
@@ -3389,13 +3399,13 @@ const W3CDTF = (d) => d.toISOString().replace(/\.\d{3}Z$/, 'Z');
 const propXml = (tag, v) => v === undefined ? '' : `<${tag}>${escapeXml$1(v)}</${tag}>`;
 function corePropsXml(p) {
     const created = p.created ? `<dcterms:created xsi:type="dcterms:W3CDTF">${W3CDTF(p.created)}</dcterms:created>` : '';
-    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">` +
         propXml('dc:title', p.title) + propXml('dc:subject', p.subject) + propXml('dc:creator', p.creator) + propXml('cp:keywords', p.keywords) +
         propXml('dc:description', p.description) + propXml('cp:category', p.category) + created + '</cp:coreProperties>';
 }
 function appPropsXml(p) {
-    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"><Application>XlsxFlow</Application>${propXml('Manager', p.manager)}${propXml('Company', p.company)}</Properties>`;
 }
 // A name Excel accepts: letters, digits, _ . and \, not a cell reference (A1, R1C1) and not reserved
@@ -3563,7 +3573,7 @@ class SheetWriter {
         });
         await this.streamString(zip, `xl/drawings/drawing${n}.xml`, drawingXml(images, images.map(img => this.media.get(img.data).info), rIds));
         const rels = targets.map((t, k) => `<Relationship Id="rId${k + 1}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="${t}"/>`).join('');
-        await this.streamString(zip, `xl/drawings/_rels/drawing${n}.xml.rels`, `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+        await this.streamString(zip, `xl/drawings/_rels/drawing${n}.xml.rels`, `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">${rels}</Relationships>`);
     }
     applyAutoFit(rows, options) {
@@ -3678,6 +3688,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++;
@@ -3688,7 +3703,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}"` : '';
@@ -3826,7 +3841,7 @@ class SheetWriter {
         let items = '';
         for (const s of this.sharedStrings.keys())
             items += `<si>${stringXml(s)}</si>`;
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="${this.sharedStringRefs}" uniqueCount="${this.sharedStrings.size}">${items}</sst>`;
     }
     // '' when the sheet has no relationships
@@ -3841,7 +3856,7 @@ class SheetWriter {
         tableIds.forEach((id, k) => { rels += `<Relationship Id="rIdTable${k + 1}" Type="${REL}/table" Target="../tables/table${id}.xml"/>`; });
         if (!rels)
             return '';
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">${rels}</Relationships>`;
     }
     buildWorkbookXml() {
@@ -3866,14 +3881,14 @@ class SheetWriter {
             }
             return names;
         }).join('');
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
-  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-  ${active > 0 ? `<bookViews><workbookView firstSheet="${active}" activeTab="${active}"/></bookViews>` : ''}
-  <sheets>
-    ${sheetsXml}
-  </sheets>
-  ${filterNames || userNames ? `<definedNames>${filterNames}${userNames}</definedNames>` : ''}
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+  ${active > 0 ? `<bookViews><workbookView firstSheet="${active}" activeTab="${active}"/></bookViews>` : ''}
+  <sheets>
+    ${sheetsXml}
+  </sheets>
+  ${filterNames || userNames ? `<definedNames>${filterNames}${userNames}</definedNames>` : ''}
 </workbook>`;
     }
     // The first visible sheet, which Excel opens on
@@ -3884,19 +3899,19 @@ class SheetWriter {
         const sheetRels = this.sheets.map((_, i) => `<Relationship Id="rId${i + 1}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet${i + 1}.xml"/>`).join('\n  ');
         const ssId = this.sheets.length + 1;
         const stylesId = this.sheets.length + 2;
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-  ${sheetRels}
-  <Relationship Id="rId${ssId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>
-  <Relationship Id="rId${stylesId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  ${sheetRels}
+  <Relationship Id="rId${ssId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>
+  <Relationship Id="rId${stylesId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
 </Relationships>`;
     }
     buildRootRels() {
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>${this.writerOptions.properties ? `
-  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
-  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>` : ''}
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>${this.writerOptions.properties ? `
+  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
+  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>` : ''}
 </Relationships>`;
     }
     buildContentTypes(drawings, commentSheets, tables) {
@@ -3907,17 +3922,17 @@ class SheetWriter {
             commentSheets.map(n => `<Override PartName="/xl/comments${n}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"/>`).join('') +
             Array.from({ length: tables }, (_, i) => `<Override PartName="/xl/tables/table${i + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"/>`).join('') +
             (commentSheets.length ? '<Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>' : '');
-        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-  <Default Extension="xml" ContentType="application/xml"/>
-  ${imageTypes}${drawingOverrides}
-  <Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
-  ${sheetOverrides}
-  <Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
-  <Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>${this.writerOptions.properties ? `
-  <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
-  <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>` : ''}
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+  <Default Extension="xml" ContentType="application/xml"/>
+  ${imageTypes}${drawingOverrides}
+  <Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
+  ${sheetOverrides}
+  <Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
+  <Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>${this.writerOptions.properties ? `
+  <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
+  <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>` : ''}
 </Types>`;
     }
 }
@@ -3949,7 +3964,7 @@ function pageSetupXml(page) {
 function commentsXml(comments) {
     const authors = [...new Set(comments.map(c => c.comment.author ?? ''))];
     const list = comments.map(c => `<comment ref="${c.ref}" authorId="${authors.indexOf(c.comment.author ?? '')}"><text>${runsXml(c.comment.text)}</text></comment>`).join('');
-    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <comments xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><authors>${authors.map(a => `<author>${escapeXml$1(a)}</author>`).join('')}</authors><commentList>${list}</commentList></comments>`;
 }
 // The legacy VML shapes Excel needs to show the note boxes (hidden until the cell is hovered)
@@ -3969,7 +3984,7 @@ function tableXml(table, id, columns) {
     const ref = table.ref.replace(/\$/g, '');
     const filter = table.autoFilter === false ? '' : `<autoFilter ref="${ref}"/>`;
     const cols = columns.map((c, k) => `<tableColumn id="${k + 1}" name="${escapeXml$1(c)}"/>`).join('');
-    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" id="${id}" name="${escapeXml$1(table.name)}" displayName="${escapeXml$1(table.name)}" ref="${ref}" totalsRowShown="0">` +
         `${filter}<tableColumns count="${columns.length}">${cols}</tableColumns>` +
         `<tableStyleInfo name="${escapeXml$1(table.style ?? 'TableStyleMedium2')}" showFirstColumn="0" showLastColumn="0" showRowStripes="${table.showRowStripes === false ? 0 : 1}" showColumnStripes="0"/></table>`;
@@ -4144,6 +4159,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']) {
@@ -4938,7 +4963,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));
@@ -5015,6 +5043,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}/>`;
             }
@@ -5776,7 +5808,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;
     };
@@ -5908,11 +5941,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/>';
     }
@@ -6005,6 +6041,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) => {
@@ -6013,7 +6058,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>';
@@ -6106,6 +6151,7 @@ exports.SheetEditor = SheetEditor;
 exports.SheetReader = SheetReader;
 exports.SheetWriter = SheetWriter;
 exports.StyleEngine = StyleEngine;
+exports.StylePatcher = StylePatcher;
 exports.XlsxFlow = XlsxFlow;
 exports.ZipRandomAccessParser = ZipRandomAccessParser;
 exports.ZipStreamWriter = ZipStreamWriter;