@office-kit/xlsx 0.17.0 → 0.18.0

package/dist/{stylesheet-writer-BBYjNSMA.mjs → stylesheet-writer-BEn-0P0x.mjs}

@@ -7,17 +7,18 @@ import { t as makeChartsheet } from "./chartsheet-C3-tqkPy.mjs";
 import { o as makeDrawing } from "./drawing-Cv6UtInY.mjs";
 import { n as VALUED_COLOR_MOD_KINDS, r as VALUELESS_COLOR_MOD_KINDS, t as SCHEME_COLOR_NAMES } from "./colors-ovWAwnZI.mjs";
 import { i as escapeXmlTextVerbatim, n as escapeXmlAttr$1, r as escapeXmlText$1 } from "./escape-rA5UpibT.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-By6RWZVW.mjs";
-import { i as defineSchema, n as toTree, r as parseXsdBoolean, t as fromTree } from "./serialize-Dmb6Vtt9.mjs";
-import { t as serializeXml } from "./serializer-dhv07Z6F.mjs";
-import { Q as findById } from "./manifest-BHUYpjUG.mjs";
-import { Dn as makeColor, Zt as makeLegacyComment, cn as multiCellRangeToString, en as makeSheetView, ln as parseMultiCellRange, mn as rangeToString, nn as makeRowDimension, ot as makeWorksheet, tn as makeColumnDimension, un as parseRange, xt as setCell } from "./worksheet-Cxn2c-jz.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-DjKKPWDL.mjs";
-import { C as addSharedRichText, O as parseRichString, w as addSharedString } from "./workbook-CMel6UcI.mjs";
-import { a as makeCfRule, i as makeDataValidation, n as makeTableColumn, o as makeConditionalFormatting, r as makeTableDefinition } from "./table-BFi2WmgG.mjs";
+import { H as DRAWING_NS, I as CX_NS, Nt as qname, T as CHART_NS, a as findChildren, dt as SHEET_DRAWING_NS, ft as SHEET_MAIN_NS, i as findChild, jt as localNameOf, lt as REL_NS, n as el, q as MARKUP_COMPAT_NS, w as CHART_DRAWING_NS, xt as X14_NS } from "./tree-CspNjuYl.mjs";
+import { i as rejectDtdDeclarations, n as parseXml, t as isWhitespaceOnly } from "./parser-B1tB9YaE.mjs";
+import { i as defineSchema, n as toTree, r as parseXsdBoolean, t as fromTree } from "./serialize-BtxgssFK.mjs";
+import { t as serializeXml } from "./serializer-N6XIwsgp.mjs";
+import { Q as findById } from "./manifest-9p0ccqmR.mjs";
+import { F as assertNotStrictRoot, T as addSharedString, k as parseRichString, w as addSharedRichText } from "./workbook-tG9oYtzU.mjs";
+import { $t as makeLegacyComment, Ct as setCell, ct as makeWorksheet, dn as parseMultiCellRange, fn as parseRange, gn as rangeToString, in as makeRowDimension, kn as makeColor, nn as makeSheetView, rn as makeColumnDimension, un as multiCellRangeToString } from "./worksheet-DLMyDD7W.mjs";
+import { It as FONT_SCHEMES, Lt as UNDERLINE_STYLES, Qt as VERTICAL_ALIGNMENTS, Rt as VERT_ALIGNS, Vt as PATTERN_TYPES, Zt as HORIZONTAL_ALIGNMENTS, qt as SIDE_STYLES } from "./cell-style-CbB4nXTY.mjs";
+import { a as makeCfRule, i as makeDataValidation, n as makeTableColumn, o as makeConditionalFormatting, r as makeTableDefinition } from "./table-BxOLUZs3.mjs";
 import { i as durationToExcel, r as dateToExcel } from "./datetime-B2ySVlXt.mjs";
-import { n as getDxfs } from "./differential-7KGzbliB.mjs";
+import { n as getDxfs } from "./differential-QLaKEiBk.mjs";
+import { SaxesParser } from "saxes";
 //#region src/drawing/dml/effect.ts
 const PRESET_SHADOW_NAMES = [
 	"shdw1",
@@ -1937,9 +1938,9 @@ const NUM_REF_TAG = `{${CHART_NS}}numRef`;
 const STR_REF_TAG = `{${CHART_NS}}strRef`;
 const NUM_CACHE_TAG = `{${CHART_NS}}numCache`;
 const STR_CACHE_TAG = `{${CHART_NS}}strCache`;
-const F_TAG$1 = `{${CHART_NS}}f`;
+const F_TAG = `{${CHART_NS}}f`;
 const PT_TAG = `{${CHART_NS}}pt`;
-const V_TAG$1 = `{${CHART_NS}}v`;
+const V_TAG = `{${CHART_NS}}v`;
 const FORMAT_CODE_TAG = `{${CHART_NS}}formatCode`;
 const BAR_DIR_TAG = `{${CHART_NS}}barDir`;
 const GROUPING_TAG = `{${CHART_NS}}grouping`;
@@ -2222,7 +2223,7 @@ const parseDataLabel = (el) => {
 			const strRef = findChild(txEl, STR_REF_TAG);
 			if (strRef) out.tx = {
 				kind: "strRef",
-				ref: findChild(strRef, F_TAG$1)?.text ?? ""
+				ref: findChild(strRef, F_TAG)?.text ?? ""
 			};
 		}
 	}
@@ -2467,7 +2468,7 @@ const parseNumCache = (cacheEl) => {
 	const values = [];
 	const fmt = findChild(cacheEl, FORMAT_CODE_TAG)?.text;
 	for (const pt of findChildren(cacheEl, PT_TAG)) {
-		const v = findChild(pt, V_TAG$1)?.text;
+		const v = findChild(pt, V_TAG)?.text;
 		if (v !== void 0) values.push(Number.parseFloat(v));
 	}
 	return fmt !== void 0 ? {
@@ -2478,7 +2479,7 @@ const parseNumCache = (cacheEl) => {
 const parseStrCache = (cacheEl) => {
 	const values = [];
 	for (const pt of findChildren(cacheEl, PT_TAG)) {
-		const v = findChild(pt, V_TAG$1)?.text;
+		const v = findChild(pt, V_TAG)?.text;
 		if (v !== void 0) values.push(v);
 	}
 	return values;
@@ -2488,7 +2489,7 @@ const parseNumericRef = (parent, tag) => {
 	if (!wrap) return void 0;
 	const numRef = findChild(wrap, NUM_REF_TAG);
 	if (!numRef) return void 0;
-	const ref = findChild(numRef, F_TAG$1)?.text ?? "";
+	const ref = findChild(numRef, F_TAG)?.text ?? "";
 	const cacheEl = findChild(numRef, NUM_CACHE_TAG);
 	if (!cacheEl) return { ref };
 	const { values, formatCode } = parseNumCache(cacheEl);
@@ -2503,7 +2504,7 @@ const parseCategoryRef = (parent) => {
 	if (!cat) return void 0;
 	const numRef = findChild(cat, NUM_REF_TAG);
 	if (numRef) {
-		const ref = findChild(numRef, F_TAG$1)?.text ?? "";
+		const ref = findChild(numRef, F_TAG)?.text ?? "";
 		const cacheEl = findChild(numRef, NUM_CACHE_TAG);
 		if (!cacheEl) return {
 			ref,
@@ -2519,7 +2520,7 @@ const parseCategoryRef = (parent) => {
 	}
 	const strRef = findChild(cat, STR_REF_TAG);
 	if (strRef) {
-		const ref = findChild(strRef, F_TAG$1)?.text ?? "";
+		const ref = findChild(strRef, F_TAG)?.text ?? "";
 		const cacheEl = findChild(strRef, STR_CACHE_TAG);
 		if (!cacheEl) return {
 			ref,
@@ -4991,11 +4992,6 @@ function parseCellNumber(raw, sheet, col, row) {
 //#region src/worksheet/reader.ts
 const WORKSHEET_TAG = `{${SHEET_MAIN_NS}}worksheet`;
 const SHEETDATA_TAG = `{${SHEET_MAIN_NS}}sheetData`;
-const ROW_TAG$1 = `{${SHEET_MAIN_NS}}row`;
-const C_TAG = `{${SHEET_MAIN_NS}}c`;
-const V_TAG = `{${SHEET_MAIN_NS}}v`;
-const F_TAG = `{${SHEET_MAIN_NS}}f`;
-const IS_TAG = `{${SHEET_MAIN_NS}}is`;
 const MERGE_CELLS_TAG = `{${SHEET_MAIN_NS}}mergeCells`;
 const MERGE_CELL_TAG = `{${SHEET_MAIN_NS}}mergeCell`;
 const SHEET_VIEWS_TAG$1 = `{${SHEET_MAIN_NS}}sheetViews`;
@@ -5081,8 +5077,14 @@ const FIRST_FOOTER_TAG = `{${SHEET_MAIN_NS}}firstFooter`;
 * doesn't carry the sheet name (it lives in `workbook.xml`).
 */
 function parseWorksheetXml(bytes, title, ctx) {
-	const root = parseXml(bytes);
-	if (root.name !== WORKSHEET_TAG) throw new OpenXmlSchemaError(`parseWorksheetXml: root is "${root.name}", expected worksheet`);
+	const text = typeof bytes === "string" ? bytes : XML_DECODER.decode(bytes);
+	rejectDtdDeclarations(text);
+	const sheetData = locateSheetData(text);
+	const root = parseXml(sheetData === void 0 ? text : text.slice(0, sheetData.bodyStart) + text.slice(sheetData.bodyEnd));
+	if (root.name !== WORKSHEET_TAG) {
+		assertNotStrictRoot(root.name);
+		throw new OpenXmlSchemaError(`parseWorksheetXml: root is "${root.name}", expected worksheet`);
+	}
 	const ws = makeWorksheet(title);
 	const sheetPrEl = findChild(root, SHEET_PR_TAG$1);
 	if (sheetPrEl) {
@@ -5115,22 +5117,7 @@ function parseWorksheetXml(bytes, title, ctx) {
 		const dim = parseColumnDimension(c);
 		ws.columnDimensions.set(dim.min, dim);
 	}
-	const sheetData = findChild(root, SHEETDATA_TAG);
-	if (sheetData) {
-		const sharedFormulas = /* @__PURE__ */ new Map();
-		let nextRow = 1;
-		for (const rowNode of findChildren(sheetData, ROW_TAG$1)) {
-			const rowIdx = parseRowIndex(rowNode, nextRow);
-			nextRow = Math.max(nextRow, rowIdx + 1);
-			maybeRecordRowDimension(ws, rowNode, rowIdx);
-			let nextCol = 1;
-			for (const cNode of findChildren(rowNode, C_TAG)) {
-				const coord = parseCellCoord(cNode, rowIdx, nextCol);
-				readCell(ws, cNode, coord, ctx, sharedFormulas);
-				nextCol = coord.col + 1;
-			}
-		}
-	}
+	if (sheetData !== void 0) readSheetData(ws, text, sheetData, ctx);
 	const protectionEl = findChild(root, SHEET_PROTECTION_TAG$1);
 	if (protectionEl) ws.sheetProtection = parseSheetProtection$1(protectionEl);
 	const ssEl = findChild(root, SORT_STATE_TAG);
@@ -6068,60 +6055,309 @@ const parseSelection = (node) => {
 	if (node.attrs["sqref"]) sel.sqref = node.attrs["sqref"];
 	return sel;
 };
-/** Row named by the first cell that carries an `@r`, if the row holds one. */
-const firstLocatedCellRow = (rowNode) => {
-	for (const cNode of rowNode.children) {
-		if (cNode.name !== C_TAG) continue;
-		const ref = cNode.attrs["r"];
-		if (ref) return coordinateToTuple(ref).row;
+const saxAttributes = (attrs) => {
+	const out = {};
+	for (const attr of Object.values(attrs)) out[qname(attr.uri, attr.local)] = attr.value;
+	return out;
+};
+const XML_DECODER = new TextDecoder("utf-8", { fatal: false });
+/**
+* Spans whose content is text rather than markup. `<` is not legal in element
+* content or in an attribute value, so a comment, a CDATA section and a
+* processing instruction are the only places a worksheet can carry the literal
+* text `<sheetData` or `</sheetData>` without meaning it, and so the only thing
+* the scans below have to step over.
+*/
+const OPAQUE_SPAN = String.raw`<!--[\s\S]*?-->|<!\[CDATA\[[\s\S]*?\]\]>|<\?[\s\S]*?\?>`;
+/** One of the same three openers with no terminator after it. */
+const UNTERMINATED_SPAN = String.raw`(?<unterminated><!--|<!\[CDATA\[|<\?)`;
+const OPAQUE_SPAN_RE = new RegExp(String.raw`${OPAQUE_SPAN}|${UNTERMINATED_SPAN}`, "g");
+/** Lexical tag boundaries, including quoted `>` and opaque XML spans. */
+const HEADER_TAG_RE = new RegExp(String.raw`${OPAQUE_SPAN}|<(?:(?:"[^"]*"|'[^']*'|[^'">])*)>`, "g");
+/** `>` or XML whitespace: the characters that can end an element name. */
+const NAME_END_RE = /^[\s>]$/;
+/**
+* Locate the `<sheetData>` span in a worksheet part so its rows can be walked
+* without building a node per cell.
+*
+* Parse the header to resolve the direct child's namespace, then scan for its
+* closing tag without constructing cell nodes. The scan skips comments, CDATA
+* sections and processing instructions and refuses unterminated opaque spans.
+*
+* `undefined` means "this sheet has no rows", and must not come to mean anything
+* else: no node-tree path for `<sheetData>` is left, so a span this function
+* declined to identify would drop every cell in the sheet in silence.
+*/
+const locateSheetData = (text) => {
+	const parser = new SaxesParser({ xmlns: true });
+	const scopes = [];
+	let found;
+	parser.on("error", (error) => {
+		throw new OpenXmlSchemaError(`worksheet: malformed header: ${error.message}`, { cause: error });
+	});
+	parser.on("opentag", (node) => {
+		const namespaces = {
+			...scopes[scopes.length - 1],
+			...node.ns
+		};
+		scopes.push(namespaces);
+		if (scopes.length === 2 && node.uri === "http://schemas.openxmlformats.org/spreadsheetml/2006/main" && node.local === "sheetData") found = {
+			tag: node.name,
+			namespaces,
+			empty: node.isSelfClosing
+		};
+	});
+	parser.on("closetag", () => {
+		scopes.pop();
+	});
+	HEADER_TAG_RE.lastIndex = 0;
+	let cursor = 0;
+	for (let tag = HEADER_TAG_RE.exec(text); tag !== null; tag = HEADER_TAG_RE.exec(text)) {
+		const bodyStart = tag.index + tag[0].length;
+		parser.write(text.slice(cursor, bodyStart));
+		cursor = bodyStart;
+		if (found !== void 0) {
+			if (found.empty) return void 0;
+			return {
+				bodyStart,
+				bodyEnd: findSheetDataClose(text, found.tag, bodyStart),
+				namespaces: found.namespaces
+			};
+		}
+	}
+};
+/** An unterminated opaque span means the part is not well-formed XML. */
+const refuseUnterminatedSpan = (match) => {
+	const opener = match.groups?.["unterminated"];
+	if (opener === void 0) return;
+	throw new OpenXmlSchemaError(`worksheet: "${opener}" is never closed`);
+};
+/**
+* Index of the `<` opening `</tag>`, skipping any candidate that sits inside an
+* opaque span. The opaque scan only ever moves forward, so a part whose rows
+* hold no comment, CDATA section or processing instruction pays for one pass
+* over the body and then never looks again.
+*/
+const findSheetDataClose = (text, tag, bodyStart) => {
+	const close = `</${tag}`;
+	let at = bodyStart;
+	let opaque = nextOpaqueSpan(text, bodyStart);
+	for (;;) {
+		const candidate = indexOfCloseTag(text, close, at);
+		if (candidate < 0) throw new OpenXmlSchemaError(`worksheet: <${tag}> is never closed`);
+		while (opaque !== void 0 && opaque.end <= candidate) opaque = nextOpaqueSpan(text, opaque.end);
+		if (opaque === void 0 || opaque.start > candidate) return candidate;
+		at = opaque.end;
+	}
+};
+/** First span at or after `from` whose content is text rather than markup. */
+const nextOpaqueSpan = (text, from) => {
+	OPAQUE_SPAN_RE.lastIndex = from;
+	const span = OPAQUE_SPAN_RE.exec(text);
+	if (span === null) return void 0;
+	refuseUnterminatedSpan(span);
+	return {
+		start: span.index,
+		end: span.index + span[0].length
+	};
+};
+/** Index of `</tag>` or `</tag   >`, never of `</tagSomethingElse>`. */
+const indexOfCloseTag = (text, close, from) => {
+	for (let at = text.indexOf(close, from); at >= 0; at = text.indexOf(close, at + close.length)) if (NAME_END_RE.test(text.charAt(at + close.length))) return at;
+	return -1;
+};
+/**
+* Text handed to saxes per `write()`. The parser carries a partial token across
+* writes, so the size only decides how much of the part is copied at once. One
+* write of a 16 MB span would hold the cell text twice over for the length of
+* the walk, which is the footprint this reader exists to remove.
+*/
+const WRITE_CHUNK = 256 * 1024;
+const isHighSurrogate = (code) => code >= 55296 && code <= 56319;
+/**
+* Walk `<sheetData>` and place every cell, resolving inherited namespaces
+* so foreign extension elements cannot become spreadsheet cells.
+*
+* `iterSheetRows` in `../streaming/read-only.ts` walks the same element shapes
+* to a different destination, and the two have to agree on where a row or cell
+* with no `@r` lands. That agreement is asserted rather than left to whoever
+* edits one of them: see "agrees with loadWorkbook on where every cell lands"
+* in `tests/worksheet/row-without-r-attribute.test.ts`.
+*/
+const readSheetData = (ws, text, span, ctx) => {
+	const sharedFormulas = /* @__PURE__ */ new Map();
+	let nextRow = 1;
+	let rowIdx = -1;
+	let rowAttrs = {};
+	let nextCol = 1;
+	const held = [];
+	let depth = 0;
+	let cell;
+	let valueTag;
+	let valueText;
+	const inlineStack = [];
+	const settleRow = (row) => {
+		rowIdx = row;
+		nextRow = Math.max(nextRow, row + 1);
+		maybeRecordRowDimension(ws, rowAttrs, row);
+		for (const heldCell of held) {
+			const coord = parseCellCoord(heldCell.ref, row, nextCol);
+			readCell(ws, heldCell, coord, ctx, sharedFormulas);
+			nextCol = coord.col + 1;
+		}
+		held.length = 0;
+	};
+	const parser = new SaxesParser({
+		fragment: true,
+		xmlns: true,
+		additionalNamespaces: span.namespaces
+	});
+	parser.on("error", (err) => {
+		throw new OpenXmlSchemaError(`worksheet: malformed <sheetData>: ${err.message}`, { cause: err });
+	});
+	parser.on("processinginstruction", (pi) => {
+		throw new OpenXmlSchemaError(`worksheet: processing instructions are not supported (saw "<?${pi.target}")`);
+	});
+	parser.on("opentag", (node) => {
+		depth++;
+		if (inlineStack.length > 0) {
+			const child = el(qname(node.uri, node.local), saxAttributes(node.attributes));
+			inlineStack[inlineStack.length - 1]?.children.push(child);
+			inlineStack.push(child);
+			return;
+		}
+		const local = node.local;
+		if (valueTag !== void 0) throw new OpenXmlSchemaError(`worksheet: mixed content not supported (<${local}> inside <${valueTag}>${cellLabel(cell)})`);
+		if (node.uri !== "http://schemas.openxmlformats.org/spreadsheetml/2006/main") return;
+		if (depth === 1) {
+			if (local !== "row") return;
+			rowAttrs = saxAttributes(node.attributes);
+			nextCol = 1;
+			held.length = 0;
+			const rAttr = rowAttrs["r"];
+			if (rAttr === void 0) rowIdx = 0;
+			else settleRow(rowNumberFromAttr(rAttr, "worksheet"));
+			return;
+		}
+		if (rowIdx < 0) return;
+		if (depth === 2) {
+			if (local !== "c") return;
+			const attrs = saxAttributes(node.attributes);
+			cell = {
+				ref: attrs["r"],
+				style: attrs["s"],
+				t: attrs["t"] ?? "n",
+				value: void 0,
+				formulaAttrs: void 0,
+				formula: void 0,
+				inline: void 0
+			};
+			return;
+		}
+		if (depth === 3 && cell !== void 0) {
+			if (local === "v" || local === "f") {
+				if (local === "f") cell.formulaAttrs = saxAttributes(node.attributes);
+				valueTag = local;
+				valueText = "";
+			} else if (local === "is") {
+				const root = el(qname(SHEET_MAIN_NS, "is"));
+				cell.inline = root;
+				inlineStack.push(root);
+			}
+		}
+	});
+	const addText = (chunk) => {
+		if (inlineStack.length > 0) {
+			const top = inlineStack[inlineStack.length - 1];
+			if (top !== void 0) top.text = (top.text ?? "") + chunk;
+			return;
+		}
+		if (valueText !== void 0) valueText += chunk;
+		else if ((depth === 0 || depth === 1 && rowIdx >= 0 || depth === 2 && cell !== void 0) && !isWhitespaceOnly(chunk)) throw new OpenXmlSchemaError("worksheet: mixed content not supported (text between cell elements)");
+	};
+	parser.on("text", addText);
+	parser.on("cdata", addText);
+	parser.on("closetag", (node) => {
+		depth--;
+		if (inlineStack.length > 0) {
+			const closed = inlineStack.pop();
+			if (closed !== void 0) refuseInlineMixedContent(closed);
+			return;
+		}
+		if (node.uri !== "http://schemas.openxmlformats.org/spreadsheetml/2006/main") return;
+		const local = node.local;
+		if (depth === 2 && cell !== void 0) {
+			if (local === "v") cell.value = valueText ?? "";
+			else if (local === "f") cell.formula = valueText ?? "";
+			valueTag = void 0;
+			valueText = void 0;
+			return;
+		}
+		if (depth === 1 && cell !== void 0 && local === "c") {
+			if (rowIdx === 0) if (cell.ref !== void 0) settleRow(coordinateToTuple(cell.ref).row);
+			else held.push(cell);
+			if (rowIdx > 0) {
+				const coord = parseCellCoord(cell.ref, rowIdx, nextCol);
+				readCell(ws, cell, coord, ctx, sharedFormulas);
+				nextCol = coord.col + 1;
+			}
+			cell = void 0;
+			return;
+		}
+		if (depth === 0 && local === "row") {
+			if (rowIdx === 0) settleRow(derivedRowNumber(nextRow, "worksheet"));
+			rowIdx = -1;
+		}
+	});
+	for (let at = span.bodyStart; at < span.bodyEnd;) {
+		let end = Math.min(at + WRITE_CHUNK, span.bodyEnd);
+		if (end < span.bodyEnd && isHighSurrogate(text.charCodeAt(end - 1))) end++;
+		parser.write(text.slice(at, end));
+		at = end;
 	}
+	parser.close();
 };
+/** The offending cell's `@r`, for an error message that can point at it. */
+const cellLabel = (cell) => cell?.ref === void 0 ? "" : ` of <c r="${cell.ref}">`;
 /**
-* Row number for a `<row>`. `@r` is optional on CT_Row (ECMA-376 §18.3.1.73);
-* without it the row is the one its first located cell names, which is the only
-* record a generator that omits `@r` leaves of a gap, and is how openpyxl's
-* reader places such a row too. With neither, the row takes `fallbackRow`.
+* Apply `parseXml`'s mixed-content rule to an `<is>` subtree this reader builds
+* itself: text alongside child elements is refused, whitespace between them is
+* dropped.
 */
-const parseRowIndex = (rowNode, fallbackRow) => {
-	const rAttr = rowNode.attrs["r"];
-	if (rAttr !== void 0) return rowNumberFromAttr(rAttr, "worksheet");
-	return firstLocatedCellRow(rowNode) ?? derivedRowNumber(fallbackRow, "worksheet");
-};
-const parseCellCoord = (cNode, rowIdx, fallbackCol) => {
-	const rAttr = cNode.attrs["r"];
-	if (rAttr === void 0) return {
+const refuseInlineMixedContent = (node) => {
+	if (node.children.length === 0 || node.text === void 0) return;
+	if (!isWhitespaceOnly(node.text)) throw new OpenXmlSchemaError(`worksheet: mixed content not supported (text between elements under <${localNameOf(node.name)}>)`);
+	delete node.text;
+};
+const parseCellCoord = (ref, rowIdx, fallbackCol) => {
+	if (ref === void 0) return {
 		row: rowIdx,
 		col: fallbackCol
 	};
-	const t = coordinateToTuple(rAttr);
-	if (t.row !== rowIdx) throw new OpenXmlSchemaError(`worksheet: <c r="${rAttr}"> row ${t.row} disagrees with row ${rowIdx}`);
+	const t = coordinateToTuple(ref);
+	if (t.row !== rowIdx) throw new OpenXmlSchemaError(`worksheet: <c r="${ref}"> row ${t.row} disagrees with row ${rowIdx}`);
 	return {
 		row: t.row,
 		col: t.col
 	};
 };
-const readCell = (ws, cNode, coord, ctx, sharedFormulas) => {
-	const t = cNode.attrs["t"] ?? "n";
-	const styleAttr = cNode.attrs["s"];
-	const styleId = styleAttr === void 0 ? 0 : parseStyleId(styleAttr);
-	const fNode = findChild(cNode, F_TAG);
-	const vNode = findChild(cNode, V_TAG);
-	const isNode = findChild(cNode, IS_TAG);
-	if (fNode) {
+const readCell = (ws, raw, coord, ctx, sharedFormulas) => {
+	const t = raw.t;
+	const styleId = raw.style === void 0 ? 0 : parseStyleId(raw.style);
+	if (raw.formulaAttrs !== void 0) {
 		const cell = setCell(ws, coord.row, coord.col, null, styleId);
-		const cachedRaw = vNode === void 0 ? void 0 : vNode.text ?? "";
-		const cached = decodeCachedValue(cachedRaw, t, ctx, ws.title, coord);
-		handleFormula(cell, fNode, coord, cached, sharedFormulas, t);
+		const cached = decodeCachedValue(raw.value, t, ctx, ws.title, coord);
+		handleFormula(cell, raw.formulaAttrs, raw.formula, coord, cached, sharedFormulas, t);
 		return;
 	}
 	let value = null;
 	switch (t) {
 		case "n":
-			value = parseCellNumber(vNode?.text, ws.title, coord.col, coord.row);
+			value = parseCellNumber(raw.value, ws.title, coord.col, coord.row);
 			break;
 		case "s": {
-			if (vNode?.text === void 0) throw new OpenXmlSchemaError("worksheet: <c t=\"s\"> missing <v>");
-			const sst = resolveSharedString(vNode.text, ctx);
+			if (raw.value === void 0 || raw.value === "") throw new OpenXmlSchemaError("worksheet: <c t=\"s\"> missing <v>");
+			const sst = resolveSharedString(raw.value, ctx);
 			value = typeof sst === "string" ? sst : {
 				kind: "rich-text",
 				runs: sst.runs
@@ -6129,18 +6365,18 @@ const readCell = (ws, cNode, coord, ctx, sharedFormulas) => {
 			break;
 		}
 		case "b": {
-			const raw = vNode?.text?.trim();
-			if (raw === void 0 || raw === "") {
+			const text = raw.value?.trim();
+			if (text === void 0 || text === "") {
 				value = null;
 				break;
 			}
-			const parsed = parseXsdBoolean(raw);
-			if (parsed === void 0) throw new OpenXmlSchemaError(`worksheet: <c r="${tupleToCoordinate(coord.col, coord.row)}" t="b"><v>${clipCellText(raw)}</v></c> is not a boolean`);
+			const parsed = parseXsdBoolean(text);
+			if (parsed === void 0) throw new OpenXmlSchemaError(`worksheet: <c r="${tupleToCoordinate(coord.col, coord.row)}" t="b"><v>${clipCellText(text)}</v></c> is not a boolean`);
 			value = parsed;
 			break;
 		}
 		case "e": {
-			const code = vNode?.text;
+			const code = raw.value;
 			if (code === void 0 || !ERROR_CODES$1.has(code)) throw new OpenXmlSchemaError(`worksheet: unknown error code "${code}" in <c t="e">`);
 			value = {
 				kind: "error",
@@ -6149,10 +6385,10 @@ const readCell = (ws, cNode, coord, ctx, sharedFormulas) => {
 			break;
 		}
 		case "str":
-			value = vNode?.text ?? "";
+			value = raw.value ?? "";
 			break;
 		case "inlineStr":
-			value = readInlineString(isNode);
+			value = readInlineString(raw.inline);
 			break;
 		default: throw new OpenXmlSchemaError(`worksheet: unknown cell type t="${t}"`);
 	}
@@ -6213,9 +6449,9 @@ const decodeCachedValue = (raw, t, ctx, sheet, coord) => {
 		default: return raw;
 	}
 };
-const handleFormula = (cell, fNode, coord, cached, sharedFormulas, cachedType) => {
-	const tAttr = fNode.attrs["t"] ?? "normal";
-	const formula = normalizeFormulaText(fNode.text ?? "");
+const handleFormula = (cell, fAttrs, fText, coord, cached, sharedFormulas, cachedType) => {
+	const tAttr = fAttrs["t"] ?? "normal";
+	const formula = normalizeFormulaText(fText ?? "");
 	const opts = cached !== void 0 ? {
 		cachedValue: cached,
 		...cachedType === "e" ? { cachedValueType: "error" } : {}
@@ -6226,17 +6462,17 @@ const handleFormula = (cell, fNode, coord, cached, sharedFormulas, cachedType) =
 			setFormula(cell, formula, opts);
 			return;
 		case "array": {
-			const ref = fNode.attrs["ref"];
+			const ref = fAttrs["ref"];
 			if (!ref) throw new OpenXmlSchemaError("worksheet: <f t=\"array\"> missing @ref");
 			setArrayFormula(cell, ref, formula, opts);
 			return;
 		}
 		case "shared": {
-			const siRaw = fNode.attrs["si"];
+			const siRaw = fAttrs["si"];
 			if (siRaw === void 0) throw new OpenXmlSchemaError("worksheet: <f t=\"shared\"> missing @si");
 			const si = Number.parseInt(siRaw, 10);
 			if (!Number.isInteger(si) || si < 0) throw new OpenXmlSchemaError(`worksheet: <f t="shared" si="${siRaw}"> is not a valid index`);
-			const ref = fNode.attrs["ref"];
+			const ref = fAttrs["ref"];
 			if (formula.length > 0) {
 				sharedFormulas.set(si, {
 					origin: tupleToCoordinate(coord.col, coord.row),
@@ -6252,19 +6488,19 @@ const handleFormula = (cell, fNode, coord, cached, sharedFormulas, cachedType) =
 			return;
 		}
 		case "dataTable": {
-			const ref = fNode.attrs["ref"];
+			const ref = fAttrs["ref"];
 			if (!ref) throw new OpenXmlSchemaError("worksheet: <f t=\"dataTable\"> missing @ref");
 			setDataTableFormula(cell, formula, {
 				ref,
 				...opts,
-				...fNode.attrs["r1"] !== void 0 ? { r1: fNode.attrs["r1"] } : {},
-				...fNode.attrs["r2"] !== void 0 ? { r2: fNode.attrs["r2"] } : {},
-				...parseXsdBoolean(fNode.attrs["dt2D"]) ? { dt2D: true } : {},
-				...parseXsdBoolean(fNode.attrs["dtr"]) ? { dtr: true } : {},
-				...parseXsdBoolean(fNode.attrs["del1"]) ? { del1: true } : {},
-				...parseXsdBoolean(fNode.attrs["del2"]) ? { del2: true } : {},
-				...parseXsdBoolean(fNode.attrs["aca"]) ? { aca: true } : {},
-				...parseXsdBoolean(fNode.attrs["ca"]) ? { ca: true } : {}
+				...fAttrs["r1"] !== void 0 ? { r1: fAttrs["r1"] } : {},
+				...fAttrs["r2"] !== void 0 ? { r2: fAttrs["r2"] } : {},
+				...parseXsdBoolean(fAttrs["dt2D"]) ? { dt2D: true } : {},
+				...parseXsdBoolean(fAttrs["dtr"]) ? { dtr: true } : {},
+				...parseXsdBoolean(fAttrs["del1"]) ? { del1: true } : {},
+				...parseXsdBoolean(fAttrs["del2"]) ? { del2: true } : {},
+				...parseXsdBoolean(fAttrs["aca"]) ? { aca: true } : {},
+				...parseXsdBoolean(fAttrs["ca"]) ? { ca: true } : {}
 			});
 			return;
 		}
@@ -6486,19 +6722,19 @@ const parseHyperlink = (node, rels) => {
 	if (node.attrs["display"]) opts.display = node.attrs["display"];
 	return opts;
 };
-const maybeRecordRowDimension = (ws, node, rowIdx) => {
+const maybeRecordRowDimension = (ws, attrs, rowIdx) => {
 	const opts = {};
-	const ht = parseFloatAttr(node.attrs["ht"]);
+	const ht = parseFloatAttr(attrs["ht"]);
 	if (ht !== void 0) opts.height = ht;
-	const customHeight = parseXsdBoolean(node.attrs["customHeight"]);
+	const customHeight = parseXsdBoolean(attrs["customHeight"]);
 	if (customHeight !== void 0) opts.customHeight = customHeight;
-	const hidden = parseXsdBoolean(node.attrs["hidden"]);
+	const hidden = parseXsdBoolean(attrs["hidden"]);
 	if (hidden !== void 0) opts.hidden = hidden;
-	const outlineLevel = parseIntegerAttr(node.attrs["outlineLevel"]);
+	const outlineLevel = parseIntegerAttr(attrs["outlineLevel"]);
 	if (outlineLevel !== void 0) opts.outlineLevel = outlineLevel;
-	const collapsed = parseXsdBoolean(node.attrs["collapsed"]);
+	const collapsed = parseXsdBoolean(attrs["collapsed"]);
 	if (collapsed !== void 0) opts.collapsed = collapsed;
-	const style = parseIntegerAttr(node.attrs["s"]);
+	const style = parseIntegerAttr(attrs["s"]);
 	if (style !== void 0) opts.style = style;
 	if (Object.keys(opts).length === 0) return;
 	ws.rowDimensions.set(rowIdx, makeRowDimension(opts));
@@ -8809,4 +9045,4 @@ const cellXfToTree = (xf) => {
 //#endregion
 export { userShapesToBytes as C, chartToBytes as D, parseChartExXml as E, findUserShapesRId as O, parseUserShapesXml as S, isChartExBytes 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, parseChartXml as k, 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, chartExToBytes as w, parseCellNumber as x, writeWorksheetXml as y };
 
-//# sourceMappingURL=stylesheet-writer-BBYjNSMA.mjs.map
+//# sourceMappingURL=stylesheet-writer-BEn-0P0x.mjs.map