@office-kit/xlsx 0.11.0 → 0.12.0

package/dist/styles/protection.schema.d.ts

@@ -1,3 +1,3 @@
-import { type Schema } from '../schema/core';
-import type { Protection } from './protection';
+import { type Schema } from '../schema/core.js';
+import type { Protection } from './protection.js';
 export declare const ProtectionSchema: Schema<Protection>;

package/dist/styles/stylesheet-reader.d.ts

@@ -1,4 +1,4 @@
-import { type Stylesheet } from './stylesheet';
+import { type Stylesheet } from './stylesheet.js';
 /**
  * Parse `xl/styles.xml` and return a fully-populated {@link Stylesheet}. Slot
  * ordering is preserved verbatim; the dedup index Maps are rebuilt after the

package/dist/styles/stylesheet-writer.d.ts

@@ -1,3 +1,3 @@
-import type { Stylesheet } from './stylesheet';
+import type { Stylesheet } from './stylesheet.js';
 /** Serialise a Stylesheet to its `xl/styles.xml` payload. */
 export declare function stylesheetToBytes(ss: Stylesheet): Uint8Array;

package/dist/styles/stylesheet.d.ts

@@ -1,8 +1,8 @@
-import type { Alignment } from './alignment';
-import type { Border } from './borders';
-import type { Fill } from './fills';
-import type { Font } from './fonts';
-import type { Protection } from './protection';
+import type { Alignment } from './alignment.js';
+import type { Border } from './borders.js';
+import type { Fill } from './fills.js';
+import type { Font } from './fonts.js';
+import type { Protection } from './protection.js';
 /**
  * One entry in the cellXfs / cellStyleXfs pool. Represents the union of
  * indexes-into-other-pools that a cell or named style points at.
@@ -38,7 +38,7 @@ export interface Stylesheet {
     cellXfs: CellXf[];
     cellStyleXfs: CellXf[];
     /** Named styles (Excel's "Cell Styles" gallery; populated by addNamedStyle). */
-    namedStyles?: Array<import('./named-styles').StylesheetNamedStyle>;
+    namedStyles?: Array<import('./named-styles.js').StylesheetNamedStyle>;
     /**
      * The tail of `<styleSheet>` this model doesn't cover — `<tableStyles>`,
      * `<colors>` and `<extLst>` (which is where Excel keeps its x14/x15 slicer
@@ -46,14 +46,14 @@ export interface Stylesheet {
      * loaded workbook keeps them; CT_Stylesheet puts all three after `<dxfs>`,
      * so the writer appends them there.
      */
-    stylesXmlTail?: Array<import('../xml/tree').XmlNode>;
+    stylesXmlTail?: Array<import('../xml/tree.js').XmlNode>;
     _fontIdByKey: Map<string, number>;
     _fillIdByKey: Map<string, number>;
     _borderIdByKey: Map<string, number>;
     _xfIdByKey: Map<string, number>;
     _styleXfIdByKey: Map<string, number>;
     _numFmtIdByCode: Map<string, number>;
-    _namedStyleByName?: Map<string, import('./named-styles').StylesheetNamedStyle>;
+    _namedStyleByName?: Map<string, import('./named-styles.js').StylesheetNamedStyle>;
 }
 /**
  * Build a fresh Stylesheet pre-populated with Excel's required default entries.
@@ -101,3 +101,29 @@ export declare function listCellStyleXfs(ss: Stylesheet): ReadonlyArray<CellXf>;
  * workbook's font 0 / fill 0 / border 0 / numFmtId 0 (General).
  */
 export declare function defaultCellXf(): CellXf;
+/**
+ * A cell's look expressed across every style axis at once. Each axis is
+ * independent: pass any subset, and the axes you leave out are decided by
+ * whichever function consumes the spec.
+ */
+export interface CellStyleSpec {
+    font?: Font;
+    fill?: Fill;
+    border?: Border;
+    alignment?: Alignment;
+    protection?: Protection;
+    numberFormat?: string;
+}
+/**
+ * Resolve a style spec to the CellXf fields it sets, registering each component
+ * in its pool. The result is a patch, not a whole xf: axes absent from `spec`
+ * are absent here too, so a caller can either spread it over
+ * {@link defaultCellXf} for a complete style or over an existing xf to merge.
+ *
+ * Every path that turns a user-facing style spec into an xf goes through this,
+ * so a new axis on {@link CellStyleSpec} reaches the modelled writer and the
+ * streaming write-only writer together.
+ */
+export declare function buildXfPatch(ss: Stylesheet, spec: CellStyleSpec): {
+    -readonly [K in keyof CellXf]?: CellXf[K];
+};

package/dist/styles.mjs

@@ -1,4 +1,4 @@
-import { An as rotateHue, Cn as luminance, Dn as pickReadableTextColor, En as normaliseRgb, On as resolveIndexedColor, Sn as lighten, Tn as mixColors, _n as colorToHex, bn as hexToHsl, gn as adjustSaturation, hn as adjustLightness, kn as rgbColor, vn as contrastRatio, wn as makeColor, xn as hslToHex, yn as darken } from "./worksheet-C5Ensf_j.mjs";
-import { $ as ensureBuiltinStyle, A as setCellFill, At as makeNumberFormat, B as setRangeBackgroundColor, Bt as makeGradientFill, C as setCellAsCurrency, Ct as FORMAT_TEXT, D as setCellBackgroundColor, Dt as isBuiltinFormat, E as setCellAsPercent, Et as classifyDateFormat, F as setFontColor, Ft as fontToCss, G as setRangeStyle, Gt as makeBorder, H as setRangeFont, Ht as makePatternFill, I as setFontName, It as makeFont, J as setUnderline, K as setRangeWrapText, Kt as makeSide, L as setFontSize, M as setCellNumberFormat, N as setCellProtection, O as setCellBorder, Ot as isDateFormat, P as setCellStyle, Q as addNamedStyle, R as setItalic, Rt as fillToCss, S as setCellAlignment, St as FORMAT_PERCENTAGE_00, T as setCellAsNumber, Tt as builtinFormatId, U as setRangeNumberFormat, V as setRangeBorderBox, Vt as makeGradientStop, W as setRangeProtection, Wt as borderToCss, X as makeProtection, Xt as makeAlignment, Y as wrapCellText, Yt as alignmentToCss, Z as BUILTIN_NAMED_STYLES, _ as getCellNumberFormat, _t as FORMAT_DATE_YYYYMMDD2, a as cellStyleToCss, at as addNumFmt, b as rotateCellText, bt as FORMAT_NUMBER_00, c as clearCellStyle, ct as listCellStyleXfs, d as copyCellStyle, dt as listFonts, et as addBorder, f as formatAsHeader, ft as makeStylesheet, g as getCellFont, gt as FORMAT_DATE_TIMEDELTA, h as getCellFill, ht as FORMAT_DATE_DATETIME, i as applyNamedStyle, it as addFont, j as setCellFont, jt as DEFAULT_FONT, k as setCellBorderAll, kt as isTimedeltaFormat, l as clearRangeStyle, lt as listCellXfs, m as getCellBorder, mt as BUILTIN_FORMATS_MAX_SIZE, n as alignCellVertical, nt as addCellXf, o as centerCell, ot as defaultCellXf, p as getCellAlignment, pt as BUILTIN_FORMATS, q as setStrikethrough, r as applyBuiltinStyle, rt as addFill, s as clearCellBackground, st as listBorders, t as alignCellHorizontal, tt as addCellStyleXf, u as cloneCellStyle, ut as listFills, v as getCellProtection, vt as FORMAT_GENERAL, w as setCellAsDate, wt as builtinFormatCode, x as setBold, xt as FORMAT_PERCENTAGE, y as indentCell, yt as FORMAT_NUMBER, z as setRangeAlignment, zt as makeFill } from "./cell-style-DuvS_Lsg.mjs";
-import { r as makeDifferentialStyle, t as addDxf } from "./differential-DvKU8fJt.mjs";
-export { BUILTIN_FORMATS, BUILTIN_FORMATS_MAX_SIZE, BUILTIN_NAMED_STYLES, DEFAULT_FONT, FORMAT_DATE_DATETIME, FORMAT_DATE_TIMEDELTA, FORMAT_DATE_YYYYMMDD2, FORMAT_GENERAL, FORMAT_NUMBER, FORMAT_NUMBER_00, FORMAT_PERCENTAGE, FORMAT_PERCENTAGE_00, FORMAT_TEXT, addBorder, addCellStyleXf, addCellXf, addDxf, addFill, addFont, addNamedStyle, addNumFmt, adjustLightness, adjustSaturation, alignCellHorizontal, alignCellVertical, alignmentToCss, applyBuiltinStyle, applyNamedStyle, borderToCss, builtinFormatCode, builtinFormatId, cellStyleToCss, centerCell, classifyDateFormat, clearCellBackground, clearCellStyle, clearRangeStyle, cloneCellStyle, colorToHex, contrastRatio, copyCellStyle, darken, defaultCellXf, ensureBuiltinStyle, fillToCss, fontToCss, formatAsHeader, getCellAlignment, getCellBorder, getCellFill, getCellFont, getCellNumberFormat, getCellProtection, hexToHsl, hslToHex, indentCell, isBuiltinFormat, isDateFormat, isTimedeltaFormat, lighten, listBorders, listCellStyleXfs, listCellXfs, listFills, listFonts, luminance, makeAlignment, makeBorder, makeColor, makeDifferentialStyle, makeFill, makeFont, makeGradientFill, makeGradientStop, makeNumberFormat, makePatternFill, makeProtection, makeSide, makeStylesheet, mixColors, normaliseRgb, pickReadableTextColor, resolveIndexedColor, rgbColor, rotateCellText, rotateHue, setBold, setCellAlignment, setCellAsCurrency, setCellAsDate, setCellAsNumber, setCellAsPercent, setCellBackgroundColor, setCellBorder, setCellBorderAll, setCellFill, setCellFont, setCellNumberFormat, setCellProtection, setCellStyle, setFontColor, setFontName, setFontSize, setItalic, setRangeAlignment, setRangeBackgroundColor, setRangeBorderBox, setRangeFont, setRangeNumberFormat, setRangeProtection, setRangeStyle, setRangeWrapText, setStrikethrough, setUnderline, wrapCellText };
+import { An as rgbColor, Cn as lighten, Dn as normaliseRgb, En as mixColors, On as pickReadableTextColor, Sn as hslToHex, Tn as makeColor, _n as adjustSaturation, bn as darken, gn as adjustLightness, jn as rotateHue, kn as resolveIndexedColor, vn as colorToHex, wn as luminance, xn as hexToHsl, yn as contrastRatio } from "./worksheet-4xW-i8j9.mjs";
+import { $ as BUILTIN_NAMED_STYLES, $t as makeAlignment, A as setCellBorder, At as isBuiltinFormat, B as setItalic, C as setBold, Ct as FORMAT_NUMBER_00, D as setCellAsNumber, Dt as builtinFormatCode, E as setCellAsDate, Et as FORMAT_TEXT, F as setCellProtection, G as setRangeNumberFormat, Gt as makePatternFill, H as setRangeBackgroundColor, Ht as makeFill, I as setCellStyle, J as setRangeWrapText, Jt as makeBorder, K as setRangeProtection, L as setFontColor, M as setCellFill, Mt as isTimedeltaFormat, N as setCellFont, Nt as makeNumberFormat, O as setCellAsPercent, Ot as builtinFormatId, P as setCellNumberFormat, Pt as DEFAULT_FONT, Q as makeProtection, Qt as alignmentToCss, R as setFontName, Rt as fontToCss, S as rotateCellText, St as FORMAT_NUMBER, T as setCellAsCurrency, Tt as FORMAT_PERCENTAGE_00, U as setRangeBorderBox, Ut as makeGradientFill, V as setRangeAlignment, Vt as fillToCss, W as setRangeFont, Wt as makeGradientStop, X as setUnderline, Y as setStrikethrough, Yt as makeSide, Z as wrapCellText, _ as getCellNumberFormat, _t as BUILTIN_FORMATS_MAX_SIZE, a as cellStyleToCss, at as addFill, b as patchCellFont, bt as FORMAT_DATE_YYYYMMDD2, c as clearCellStyle, d as copyCellStyle, dt as listCellStyleXfs, et as addNamedStyle, f as formatAsHeader, ft as listCellXfs, g as getCellFont, gt as BUILTIN_FORMATS, h as getCellFill, ht as makeStylesheet, i as applyNamedStyle, it as addCellXf, j as setCellBorderAll, jt as isDateFormat, k as setCellBackgroundColor, kt as classifyDateFormat, l as clearRangeStyle, lt as defaultCellXf, m as getCellBorder, mt as listFonts, n as alignCellVertical, nt as addBorder, o as centerCell, ot as addFont, p as getCellAlignment, pt as listFills, q as setRangeStyle, qt as borderToCss, r as applyBuiltinStyle, rt as addCellStyleXf, s as clearCellBackground, st as addNumFmt, t as alignCellHorizontal, tt as ensureBuiltinStyle, u as cloneCellStyle, ut as listBorders, v as getCellProtection, vt as FORMAT_DATE_DATETIME, w as setCellAlignment, wt as FORMAT_PERCENTAGE, x as registerCellStyle, xt as FORMAT_GENERAL, y as indentCell, yt as FORMAT_DATE_TIMEDELTA, z as setFontSize, zt as makeFont } from "./cell-style-BFmJOmcx.mjs";
+import { r as makeDifferentialStyle, t as addDxf } from "./differential-H9SjEeIU.mjs";
+export { BUILTIN_FORMATS, BUILTIN_FORMATS_MAX_SIZE, BUILTIN_NAMED_STYLES, DEFAULT_FONT, FORMAT_DATE_DATETIME, FORMAT_DATE_TIMEDELTA, FORMAT_DATE_YYYYMMDD2, FORMAT_GENERAL, FORMAT_NUMBER, FORMAT_NUMBER_00, FORMAT_PERCENTAGE, FORMAT_PERCENTAGE_00, FORMAT_TEXT, addBorder, addCellStyleXf, addCellXf, addDxf, addFill, addFont, addNamedStyle, addNumFmt, adjustLightness, adjustSaturation, alignCellHorizontal, alignCellVertical, alignmentToCss, applyBuiltinStyle, applyNamedStyle, borderToCss, builtinFormatCode, builtinFormatId, cellStyleToCss, centerCell, classifyDateFormat, clearCellBackground, clearCellStyle, clearRangeStyle, cloneCellStyle, colorToHex, contrastRatio, copyCellStyle, darken, defaultCellXf, ensureBuiltinStyle, fillToCss, fontToCss, formatAsHeader, getCellAlignment, getCellBorder, getCellFill, getCellFont, getCellNumberFormat, getCellProtection, hexToHsl, hslToHex, indentCell, isBuiltinFormat, isDateFormat, isTimedeltaFormat, lighten, listBorders, listCellStyleXfs, listCellXfs, listFills, listFonts, luminance, makeAlignment, makeBorder, makeColor, makeDifferentialStyle, makeFill, makeFont, makeGradientFill, makeGradientStop, makeNumberFormat, makePatternFill, makeProtection, makeSide, makeStylesheet, mixColors, normaliseRgb, patchCellFont, pickReadableTextColor, registerCellStyle, resolveIndexedColor, rgbColor, rotateCellText, rotateHue, setBold, setCellAlignment, setCellAsCurrency, setCellAsDate, setCellAsNumber, setCellAsPercent, setCellBackgroundColor, setCellBorder, setCellBorderAll, setCellFill, setCellFont, setCellNumberFormat, setCellProtection, setCellStyle, setFontColor, setFontName, setFontSize, setItalic, setRangeAlignment, setRangeBackgroundColor, setRangeBorderBox, setRangeFont, setRangeNumberFormat, setRangeProtection, setRangeStyle, setRangeWrapText, setStrikethrough, setUnderline, wrapCellText };

package/dist/{stylesheet-writer-BrOw4jMY.mjs → stylesheet-writer-D7Uug85X.mjs}

@@ -1,23 +1,23 @@
 import { n as OpenXmlError, o as OpenXmlSchemaError } from "./exceptions-D-CFwxgm.mjs";
-import { a as columnLetterFromIndex, g as tupleToCoordinate, i as columnIndexFromLetter, s as coordinateToTuple } from "./coordinate-96Ecci4d.mjs";
-import { t as ERROR_CODES$1 } from "./inference-BrI9uIY4.mjs";
-import { E as setSharedFormula, S as setArrayFormula, T as setFormula, c as getCoordinate, w as setDataTableFormula } from "./cell-BucgGwl3.mjs";
+import { a as columnLetterFromIndex, g as tupleToCoordinate, i as columnIndexFromLetter, s as coordinateToTuple } from "./coordinate-Bt5Gni2I.mjs";
+import { r as normalizeFormulaText, t as ERROR_CODES$1 } from "./inference-BMvv9cUY.mjs";
+import { A as setSharedFormula, E as setArrayFormula, O as setDataTableFormula, c as getCoordinate, k as setFormula } from "./cell-Df3cKRIl.mjs";
 import { C as makeSurface3DChart, S as makeStockChart, _ as makePie3DChart, a as makeArea3DChart, b as makeScatterChart, c as makeBarChart, d as makeBubbleSeries, f as makeChartSpace, g as makeOfPieChart, h as makeLineChart, l as makeBarSeries, m as makeLine3DChart, n as makeChartDrawing, o as makeAreaChart, p as makeDoughnutChart, s as makeBar3DChart, u as makeBubbleChart, v as makePieChart, w as makeSurfaceChart, x as makeScatterSeries, y as makeRadarChart } from "./user-shapes-DfmCGKB0.mjs";
 import { t as makeChartsheet } from "./chartsheet-C3-tqkPy.mjs";
-import { o as makeDrawing } from "./drawing-BxzLuryn.mjs";
+import { o as makeDrawing } from "./drawing-ZJ3h4VHD.mjs";
 import { n as VALUED_COLOR_MOD_KINDS, r as VALUELESS_COLOR_MOD_KINDS, t as SCHEME_COLOR_NAMES } from "./colors-ovWAwnZI.mjs";
-import { n as escapeXmlAttr$1, r as escapeXmlText$1, t as escapeCellString } from "./escape-DFTE7ZJc.mjs";
+import { n as escapeXmlAttr$1, r as escapeXmlText$1, t as escapeCellString } from "./escape-rnWSPpWY.mjs";
 import { H as DRAWING_NS, I as CX_NS, T as CHART_NS, a as findChildren, bt as X14_NS, dt as SHEET_DRAWING_NS, ft as SHEET_MAIN_NS, i as findChild, jt as qname, lt as REL_NS, n as el, q as MARKUP_COMPAT_NS, w as CHART_DRAWING_NS } from "./tree-BX-sRRVp.mjs";
-import { t as parseXml } from "./parser-D3SLaOFe.mjs";
+import { t as parseXml } from "./parser-By6RWZVW.mjs";
 import { n as toTree, r as defineSchema, t as fromTree } from "./serialize-BC2Wu3bR.mjs";
-import { t as serializeXml } from "./serializer-BtO2TrI7.mjs";
-import { Q as findById } from "./manifest-Cm9K7D62.mjs";
-import { $t as makeRowDimension, Jt as makeLegacyComment, Qt as makeColumnDimension, Zt as makeSheetView, an as multiCellRangeToString, at as makeWorksheet, bt as setCell, dn as rangeToString, on as parseMultiCellRange, sn as parseRange, wn as makeColor } from "./worksheet-C5Ensf_j.mjs";
-import { Jt as VERTICAL_ALIGNMENTS, Lt as PATTERN_TYPES, Mt as FONT_SCHEMES, Nt as UNDERLINE_STYLES, Pt as VERT_ALIGNS, Ut as SIDE_STYLES, qt as HORIZONTAL_ALIGNMENTS } from "./cell-style-DuvS_Lsg.mjs";
-import { C as addSharedRichText, O as parseRichString, w as addSharedString } from "./workbook-CARZS94U.mjs";
-import { a as makeCfRule, i as makeDataValidation, n as makeTableColumn, o as makeConditionalFormatting, r as makeTableDefinition } from "./table-1P8we2gS.mjs";
+import { t as serializeXml } from "./serializer-C6nm0mRJ.mjs";
+import { Q as findById } from "./manifest-pLmx7KYh.mjs";
+import { $t as makeColumnDimension, Qt as makeSheetView, Tn as makeColor, Yt as makeLegacyComment, cn as parseRange, en as makeRowDimension, fn as rangeToString, on as multiCellRangeToString, ot as makeWorksheet, sn as parseMultiCellRange, xt as setCell } from "./worksheet-4xW-i8j9.mjs";
+import { Bt as PATTERN_TYPES, Ft as FONT_SCHEMES, It as UNDERLINE_STYLES, Kt as SIDE_STYLES, Lt as VERT_ALIGNS, Xt as HORIZONTAL_ALIGNMENTS, Zt as VERTICAL_ALIGNMENTS } from "./cell-style-BFmJOmcx.mjs";
+import { C as addSharedRichText, O as parseRichString, w as addSharedString } from "./workbook-B15-T4cs.mjs";
+import { a as makeCfRule, i as makeDataValidation, n as makeTableColumn, o as makeConditionalFormatting, r as makeTableDefinition } from "./table-Ccro4rrz.mjs";
 import { i as durationToExcel, r as dateToExcel } from "./datetime-B2ySVlXt.mjs";
-import { n as getDxfs } from "./differential-DvKU8fJt.mjs";
+import { n as getDxfs } from "./differential-H9SjEeIU.mjs";
 //#region src/drawing/dml/effect.ts
 const PRESET_SHADOW_NAMES = [
 	"shdw1",
@@ -6156,10 +6156,11 @@ const decodeCachedValue = (raw, t) => {
 };
 const handleFormula = (cell, fNode, coord, cached, sharedFormulas) => {
 	const tAttr = fNode.attrs["t"] ?? "normal";
-	const formula = fNode.text ?? "";
+	const formula = normalizeFormulaText(fNode.text ?? "");
 	const opts = cached !== void 0 ? { cachedValue: cached } : void 0;
 	switch (tAttr) {
 		case "normal":
+			if (formula.length === 0) throw new OpenXmlSchemaError(`worksheet: <f> at ${tupleToCoordinate(coord.col, coord.row)} has no formula text`);
 			setFormula(cell, formula, opts);
 			return;
 		case "array": {
@@ -6185,8 +6186,7 @@ const handleFormula = (cell, fNode, coord, cached, sharedFormulas) => {
 			const cache = sharedFormulas.get(si);
 			if (!cache) throw new OpenXmlSchemaError(`worksheet: <f t="shared" si="${si}"/> with no preceding origin formula`);
 			const dest = tupleToCoordinate(coord.col, coord.row);
-			const translated = translateFormula(`=${cache.formula}`, cache.origin, { dest });
-			setSharedFormula(cell, si, translated.startsWith("=") ? translated.slice(1) : translated, void 0, opts);
+			setSharedFormula(cell, si, translateFormula(`=${cache.formula}`, cache.origin, { dest }), void 0, opts);
 			return;
 		}
 		case "dataTable": {
@@ -6489,7 +6489,9 @@ function serializeWorksheet(ws, ctx) {
 		parts.push(`<row r="${rowIdx}"${dimAttrs}>`);
 		for (const colIdx of colKeys) {
 			const cell = row.get(colIdx);
-			if (cell) parts.push(serializeCell(cell, ctx));
+			if (!cell) continue;
+			if (cell.styleId !== 0 && (!Number.isInteger(cell.styleId) || cell.styleId < 0 || cell.styleId >= ctx.styles.cellXfs.length)) throw unknownStyleId(cell, ws.title, ctx.styles.cellXfs.length);
+			parts.push(serializeCell(cell, ctx));
 		}
 		parts.push("</row>");
 	}
@@ -6587,6 +6589,15 @@ const serializeDimension = (ws) => {
 	const col2 = colLetters(maxCol);
 	return `<dimension ref="${minRow === maxRow && minCol === maxCol ? `${col1}${minRow}` : `${col1}${minRow}:${col2}${maxRow}`}"/>`;
 };
+/**
+* Excel resolves `<c s="n">` against `cellXfs`, and refuses to open a sheet
+* whose `n` names no entry: the file loads with the repair dialog and the sheet
+* is dropped. A `styleId` that leaves the pool it came from is the way to get
+* there, most often an id from `registerCellStyle` applied to a cell in a
+* different workbook, so refuse to emit rather than write a file Excel will
+* reject.
+*/
+const unknownStyleId = (cell, sheetTitle, xfCount) => new OpenXmlSchemaError(`Cell ${getCoordinate(cell)} on sheet "${sheetTitle}" has styleId ${cell.styleId}, outside this workbook's cellXfs pool [0, ${xfCount}). A styleId is an index into one workbook's stylesheet; ids from registerCellStyle are valid only for the workbook that produced them.`);
 const colLetters = (n) => {
 	let m = n;
 	let out = "";
@@ -6651,7 +6662,9 @@ const serializeFormulaCell = (ref, styleAttr, f) => {
 	if (f.aca) fAttrs.push("aca=\"1\"");
 	if (f.ca) fAttrs.push("ca=\"1\"");
 	const fAttrStr = fAttrs.length > 0 ? ` ${fAttrs.join(" ")}` : "";
-	const formulaText = escapeXmlText(escapeCellString(f.formula));
+	const normalized = normalizeFormulaText(f.formula);
+	if ((f.t === "normal" || f.t === "array") && normalized.length === 0) throw new OpenXmlSchemaError(`worksheet: ${f.t} formula must not be empty at ${ref}`);
+	const formulaText = escapeXmlText(escapeCellString(normalized));
 	const fEl = formulaText.length > 0 ? `<f${fAttrStr}>${formulaText}</f>` : `<f${fAttrStr}/>`;
 	let valueAttr = "";
 	let vEl = "";
@@ -6798,7 +6811,7 @@ const serializeCfRule = (rule) => {
 	if (rule.stdDev !== void 0) attrs += ` stdDev="${rule.stdDev}"`;
 	if (rule.timePeriod !== void 0) attrs += ` timePeriod="${rule.timePeriod}"`;
 	const inner = [];
-	for (const f of rule.formulas) inner.push(`<formula>${escapeXmlText(f)}</formula>`);
+	for (const f of rule.formulas) inner.push(`<formula>${escapeXmlText(normalizeFormulaText(f))}</formula>`);
 	if (rule.innerXml) inner.push(rule.innerXml);
 	if (inner.length === 0) return `<cfRule${attrs}/>`;
 	return `<cfRule${attrs}>${inner.join("")}</cfRule>`;
@@ -6823,8 +6836,8 @@ const serializeDataValidation = (dv) => {
 	if (dv.prompt !== void 0) attrs += ` prompt="${escapeXmlAttr(dv.prompt)}"`;
 	attrs += ` sqref="${escapeXmlAttr(multiCellRangeToString(dv.sqref))}"`;
 	const formulas = [];
-	if (dv.formula1 !== void 0) formulas.push(`<formula1>${escapeXmlText(dv.formula1)}</formula1>`);
-	if (dv.formula2 !== void 0) formulas.push(`<formula2>${escapeXmlText(dv.formula2)}</formula2>`);
+	if (dv.formula1 !== void 0) formulas.push(`<formula1>${escapeXmlText(normalizeFormulaText(dv.formula1))}</formula1>`);
+	if (dv.formula2 !== void 0) formulas.push(`<formula2>${escapeXmlText(normalizeFormulaText(dv.formula2))}</formula2>`);
 	if (formulas.length === 0) return `<dataValidation${attrs}/>`;
 	return `<dataValidation${attrs}>${formulas.join("")}</dataValidation>`;
 };
@@ -8709,4 +8722,4 @@ const cellXfToTree = (xf) => {
 //#endregion
 export { chartExToBytes as C, findUserShapesRId as D, chartToBytes as E, parseChartXml as O, userShapesToBytes as S, parseChartExXml as T, parseChartsheetXml as _, parseCommentsXml as a, parseWorksheetXml as b, NumberFormatSchema as c, BorderSchema as d, AlignmentSchema as f, chartsheetToBytes as g, parseDrawingXml as h, commentsToBytes as i, FontSchema as l, drawingToBytes as m, parseTableXml as n, placeholderVmlDrawing as o, collectRawRelIds as p, tableToBytes as r, ProtectionSchema as s, stylesheetToBytes as t, fillFromTree as u, serializeCell as v, isChartExBytes as w, parseUserShapesXml as x, worksheetToBytes as y };
 
-//# sourceMappingURL=stylesheet-writer-BrOw4jMY.mjs.map
+//# sourceMappingURL=stylesheet-writer-D7Uug85X.mjs.map