@shbernal/ts-xlsx 2.0.0 → 3.0.0

package/dist/io/xlsx/sheet-properties.js

@@ -1,6 +1,7 @@
 import { encodeAddress } from '../../core/address.js';
+import { HEADER_FOOTER_ELEMENTS, MARGIN_SIDES, PAGE_SETUP_FACETS, PRINT_OPTION_FLAGS, } from '../../core/page-setup.js';
 import { SHEET_PROTECTION_FLAGS } from '../../core/protection.js';
-import { attr, boolAttr, escapeAttr, escapeSpreadsheetText, numberText } from '../../xml/xml.js';
+import { boolAttr, checkedToken, escapeAttr, escapeSpreadsheetText, numAttr, numberText, } from '../../xml/xml.js';
 import { colorAttrs } from './color-xml.js';
 export function sheetViewsXml(view, active) {
     const selected = active ? ' tabSelected="1"' : '';
@@ -79,16 +80,8 @@ function filterCriteriaXml(criteria) {
         .join('');
     return `<customFilters${andAttr}>${predicates}</customFilters>`;
 }
-const HF_CHILDREN = [
-    { tag: 'oddHeader', key: 'oddHeader' },
-    { tag: 'oddFooter', key: 'oddFooter' },
-    { tag: 'evenHeader', key: 'evenHeader' },
-    { tag: 'evenFooter', key: 'evenFooter' },
-    { tag: 'firstHeader', key: 'firstHeader' },
-    { tag: 'firstFooter', key: 'firstFooter' },
-];
 export function headerFooterXml(hf) {
-    const children = HF_CHILDREN.filter(({ key }) => hf[key] !== undefined);
+    const children = HEADER_FOOTER_ELEMENTS.filter((key) => hf[key] !== undefined);
     if (children.length === 0)
         return '';
     const differentOddEven = hf.evenHeader !== undefined || hf.evenFooter !== undefined;
@@ -99,7 +92,7 @@ export function headerFooterXml(hf) {
     if (differentFirst)
         attrs += ' differentFirst="1"';
     const body = children
-        .map(({ tag, key }) => `<${tag}>${escapeSpreadsheetText(hf[key])}</${tag}>`)
+        .map((key) => `<${key}>${escapeSpreadsheetText(hf[key] ?? '')}</${key}>`)
         .join('');
     return `<headerFooter${attrs}>${body}</headerFooter>`;
 }
@@ -111,13 +104,8 @@ const DEFAULT_MARGINS = {
     header: 0.3,
     footer: 0.3,
 };
-const MARGIN_SIDES = ['left', 'right', 'top', 'bottom', 'header', 'footer'];
 export function printOptionsXml(printOptions) {
-    const attrs = boolAttr('horizontalCentered', printOptions.horizontalCentered) +
-        boolAttr('verticalCentered', printOptions.verticalCentered) +
-        boolAttr('headings', printOptions.headings) +
-        boolAttr('gridLines', printOptions.gridLines) +
-        boolAttr('gridLinesSet', printOptions.gridLinesSet);
+    const attrs = PRINT_OPTION_FLAGS.map((flag) => boolAttr(flag, printOptions[flag])).join('');
     return attrs === '' ? '' : `<printOptions${attrs}/>`;
 }
 export function pageMarginsXml(margins) {
@@ -127,13 +115,23 @@ export function pageMarginsXml(margins) {
     return `<pageMargins ${attrs}/>`;
 }
 export function pageSetupXml(pageSetup, printerSettingsRelId) {
-    const attrs = attr('paperSize', pageSetup.paperSize) +
-        attr('scale', pageSetup.scale) +
-        attr('fitToWidth', pageSetup.fitToWidth) +
-        attr('fitToHeight', pageSetup.fitToHeight) +
-        (pageSetup.pageOrder !== undefined ? ` pageOrder="${pageSetup.pageOrder}"` : '') +
-        (pageSetup.orientation !== undefined ? ` orientation="${pageSetup.orientation}"` : '') +
-        (printerSettingsRelId !== null ? ` r:id="${printerSettingsRelId}"` : '');
+    let attrs = '';
+    for (const facet of PAGE_SETUP_FACETS) {
+        switch (facet.kind) {
+            case 'count':
+                attrs += numAttr(facet.key, pageSetup[facet.key]);
+                break;
+            case 'token': {
+                const value = pageSetup[facet.key];
+                if (value !== undefined) {
+                    attrs += ` ${facet.key}="${checkedToken(value, facet.isValid, facet.label)}"`;
+                }
+                break;
+            }
+        }
+    }
+    if (printerSettingsRelId !== null)
+        attrs += ` r:id="${printerSettingsRelId}"`;
     return attrs === '' ? '' : `<pageSetup${attrs}/>`;
 }
 export function pageBreaksXml(breaks, element) {
@@ -141,8 +139,7 @@ export function pageBreaksXml(breaks, element) {
         return '';
     const brks = breaks
         .map((brk) => {
-        const maxAttr = brk.max !== undefined ? ` max="${brk.max}"` : '';
-        return `<brk id="${brk.id}"${maxAttr} man="1"/>`;
+        return `<brk${numAttr('id', brk.id)}${numAttr('max', brk.max)} man="1"/>`;
     })
         .join('');
     return `<${element} count="${breaks.length}" manualBreakCount="${breaks.length}">${brks}</${element}>`;

package/dist/io/xlsx/styles.d.ts

@@ -1,18 +1,6 @@
-import { type Alignment, type Border, type DifferentialStyle, type Fill, type Font, type NamedCellStyle, type Protection, type TableStyleTable } from '../../core/style.ts';
+import { type DifferentialStyle, type Font, type NamedCellStyle, type TableStyleTable } from '../../core/style.ts';
 import { type TableStyle } from '../../core/table-style.ts';
-/** A cell's style facets as the writer composes them: cell overrides atop row/column defaults. */
-export interface CellStyle {
-    readonly fill?: Fill | undefined;
-    readonly numFmt?: string | undefined;
-    readonly font?: Font | undefined;
-    readonly border?: Border | undefined;
-    readonly alignment?: Alignment | undefined;
-    readonly protection?: Protection | undefined;
-    /** The quote-prefix flag: an attribute on the xf, not a shared sub-table entry. */
-    readonly quotePrefix?: boolean | undefined;
-    /** The `xfId` link into `cellStyleXfs`: the named cell style this format inherits from (0 = Normal). */
-    readonly xfId?: number | undefined;
-}
+import type { XfStyle } from '../style/xf-style.ts';
 /** What a {@link StyleRegistry} needs from its workbook before any style is interned. */
 export interface StyleRegistryOptions {
     /**
@@ -41,7 +29,7 @@ export declare class StyleRegistry {
      * The `<cellXfs>` index for a composed cell/row/column style. A style with no facet needs
      * no entry and resolves to the default xf 0, so its owner emits no `s` attribute at all.
      */
-    styleId(style: CellStyle): number;
+    styleId(style: XfStyle): number;
     /**
      * Seed the named cell styles (`<cellStyleXfs>`/`<cellStyles>`) read from a file, in place of the
      * lone default, interning each style's facets into the shared sub-tables so its `fillId`/`fontId`/…

package/dist/io/xlsx/styles.js

@@ -1,8 +1,7 @@
-import { isBorderStyle, isFillPatternType, isFontScheme, isFontVerticalAlignment, isHorizontalAlignment, isNamedUnderlineStyle, isVerticalAlignment, } from '../../core/style.js';
+import { ALIGNMENT_FACETS, isBorderStyle, isFillPatternType, isFontScheme, isFontVerticalAlignment, isNamedUnderlineStyle, } from '../../core/style.js';
 import { TABLE_STYLE_ELEMENT_TYPES } from '../../core/table-style.js';
-import { AuthoringError } from '../../errors.js';
-import { decodeEntities } from '../../xml/xml-read.js';
-import { assertRepresentable, escapeAttr, XML_DECLARATION } from '../../xml/xml.js';
+import { decodeEntities } from '../../xml/xml-scan.js';
+import { assertRepresentable, checkedToken, escapeAttr, numberText, XML_DECLARATION, } from '../../xml/xml.js';
 import { colorAttrs } from './color-xml.js';
 import { MARKUP_COMPATIBILITY_NS, SPREADSHEETML_NS } from './namespaces.js';
 const RESERVED_FILL_COUNT = 2;
@@ -21,6 +20,36 @@ const DEFAULT_FORMAT = {
     quotePrefix: false,
     xfId: 0,
 };
+class InternTable {
+    #entries = [];
+    #idByKey = new Map();
+    #base;
+    constructor(base) {
+        this.#base = base;
+    }
+    get entries() {
+        return this.#entries;
+    }
+    get size() {
+        return this.#entries.length;
+    }
+    intern(key, entry) {
+        const existing = this.#idByKey.get(key);
+        if (existing !== undefined)
+            return existing;
+        const id = this.#base + this.#entries.length;
+        this.#entries.push(entry);
+        this.#idByKey.set(key, id);
+        return id;
+    }
+    seed(entry) {
+        const id = this.#base + this.#entries.length;
+        this.#entries.push(entry);
+        if (!this.#idByKey.has(entry))
+            this.#idByKey.set(entry, id);
+        return id;
+    }
+}
 export class StyleRegistry {
     #defaultFontBody;
     #font0Bodies;
@@ -31,22 +60,17 @@ export class StyleRegistry {
             ? [this.#defaultFontBody]
             : [this.#defaultFontBody, fontXml(options.declaredDefaultFont)]);
     }
-    #fillXml = [];
-    #fillIdBySignature = new Map();
-    #numFmtCodes = [];
-    #numFmtIdByCode = new Map();
-    #fontXml = [];
-    #fontIdBySignature = new Map();
-    #borderXml = [];
-    #borderIdBySignature = new Map();
+    #fills = new InternTable(RESERVED_FILL_COUNT);
+    #numFmts = new InternTable(CUSTOM_NUMFMT_BASE);
+    #fonts = new InternTable(RESERVED_FONT_COUNT);
+    #borders = new InternTable(RESERVED_BORDER_COUNT);
     #formats = [DEFAULT_FORMAT];
     #xfIndexBySignature = new Map();
     #cellStyleXfs = [DEFAULT_FORMAT];
     #cellStyleNames = [
         { name: 'Normal', builtinId: 0, xfId: 0 },
     ];
-    #dxfXml = [];
-    #dxfIndexByFragment = new Map();
+    #dxfs = new InternTable(0);
     #indexedColors = [];
     #mruColors = [];
     #tableStyles = { styles: [] };
@@ -94,12 +118,8 @@ export class StyleRegistry {
         });
     }
     seedDifferentialStyles(fragments) {
-        for (const fragment of fragments) {
-            const index = this.#dxfXml.length;
-            this.#dxfXml.push(fragment);
-            if (!this.#dxfIndexByFragment.has(fragment))
-                this.#dxfIndexByFragment.set(fragment, index);
-        }
+        for (const fragment of fragments)
+            this.#dxfs.seed(fragment);
     }
     seedIndexedColors(fragments) {
         this.#indexedColors.length = 0;
@@ -128,69 +148,36 @@ export class StyleRegistry {
     }
     differentialStyleId(style) {
         const fragment = dxfXml(style);
-        let index = this.#dxfIndexByFragment.get(fragment);
-        if (index === undefined) {
-            index = this.#dxfXml.length;
-            this.#dxfXml.push(fragment);
-            this.#dxfIndexByFragment.set(fragment, index);
-        }
-        return index;
+        return this.#dxfs.intern(fragment, fragment);
     }
     #internFill(fill) {
-        const signature = fillSignature(fill);
-        let id = this.#fillIdBySignature.get(signature);
-        if (id === undefined) {
-            id = RESERVED_FILL_COUNT + this.#fillXml.length;
-            this.#fillXml.push(patternFillXml(fill, { solidBgFallback: true }));
-            this.#fillIdBySignature.set(signature, id);
-        }
-        return id;
+        return this.#fills.intern(fillSignature(fill), patternFillXml(fill, { solidBgFallback: true }));
     }
     #internNumFmt(code) {
-        let id = this.#numFmtIdByCode.get(code);
-        if (id === undefined) {
-            id = CUSTOM_NUMFMT_BASE + this.#numFmtCodes.length;
-            this.#numFmtCodes.push(code);
-            this.#numFmtIdByCode.set(code, id);
-        }
-        return id;
+        return this.#numFmts.intern(code, code);
     }
     #internFont(font) {
         const xml = fontXml(font);
         if (xml === '' || this.#font0Bodies.has(xml))
             return 0;
-        let id = this.#fontIdBySignature.get(xml);
-        if (id === undefined) {
-            id = RESERVED_FONT_COUNT + this.#fontXml.length;
-            this.#fontXml.push(`<font>${xml}</font>`);
-            this.#fontIdBySignature.set(xml, id);
-        }
-        return id;
+        return this.#fonts.intern(xml, `<font>${xml}</font>`);
     }
     #internBorder(border) {
         const xml = borderXml(border);
-        if (xml === DEFAULT_BORDER)
-            return 0;
-        let id = this.#borderIdBySignature.get(xml);
-        if (id === undefined) {
-            id = RESERVED_BORDER_COUNT + this.#borderXml.length;
-            this.#borderXml.push(xml);
-            this.#borderIdBySignature.set(xml, id);
-        }
-        return id;
+        return xml === DEFAULT_BORDER ? 0 : this.#borders.intern(xml, xml);
     }
     toXml() {
-        const fillCount = RESERVED_FILL_COUNT + this.#fillXml.length;
+        const fillCount = RESERVED_FILL_COUNT + this.#fills.size;
         const fills = '<fill><patternFill patternType="none"/></fill>' +
             '<fill><patternFill patternType="gray125"/></fill>' +
-            this.#fillXml.join('');
+            this.#fills.entries.join('');
         const cellXfs = this.#formats.map((format) => xfXml(format, format.xfId)).join('');
         const cellStyleXfs = this.#cellStyleXfs.map((format) => xfXml(format, null)).join('');
         const cellStyles = this.#cellStyleNames.map(cellStyleTag).join('');
-        const fontCount = RESERVED_FONT_COUNT + this.#fontXml.length;
-        const fonts = `<font>${this.#defaultFontBody}</font>${this.#fontXml.join('')}`;
-        const borderCount = RESERVED_BORDER_COUNT + this.#borderXml.length;
-        const borders = DEFAULT_BORDER + this.#borderXml.join('');
+        const fontCount = RESERVED_FONT_COUNT + this.#fonts.size;
+        const fonts = `<font>${this.#defaultFontBody}</font>${this.#fonts.entries.join('')}`;
+        const borderCount = RESERVED_BORDER_COUNT + this.#borders.size;
+        const borders = DEFAULT_BORDER + this.#borders.entries.join('');
         return (XML_DECLARATION +
             `<styleSheet xmlns="${SPREADSHEETML_NS}"${this.#foreignNamespaceAttrs()}>` +
             this.#numFmtsXml() +
@@ -245,17 +232,17 @@ export class StyleRegistry {
         return `<colors>${indexed}${mru}</colors>`;
     }
     #dxfsXml() {
-        if (this.#dxfXml.length === 0)
+        if (this.#dxfs.size === 0)
             return '<dxfs count="0"/>';
-        return `<dxfs count="${this.#dxfXml.length}">${this.#dxfXml.join('')}</dxfs>`;
+        return `<dxfs count="${this.#dxfs.size}">${this.#dxfs.entries.join('')}</dxfs>`;
     }
     #numFmtsXml() {
-        if (this.#numFmtCodes.length === 0)
+        if (this.#numFmts.size === 0)
             return '';
-        const entries = this.#numFmtCodes
+        const entries = this.#numFmts.entries
             .map((code, i) => `<numFmt numFmtId="${CUSTOM_NUMFMT_BASE + i}" formatCode="${escapeFormatCode(code)}"/>`)
             .join('');
-        return `<numFmts count="${this.#numFmtCodes.length}">${entries}</numFmts>`;
+        return `<numFmts count="${this.#numFmts.size}">${entries}</numFmts>`;
     }
 }
 function isDefaultFormat(format) {
@@ -292,32 +279,29 @@ function cellStyleTag(entry) {
     const builtin = entry.builtinId === undefined ? '' : ` builtinId="${entry.builtinId}"`;
     return `<cellStyle name="${escapeAttr(entry.name)}" xfId="${entry.xfId}"${builtin}/>`;
 }
-function checkedToken(value, isValid, kind) {
-    if (!isValid(value)) {
-        throw new AuthoringError(`Invalid ${kind} ${JSON.stringify(value)}: not a value the OOXML enumeration allows`);
-    }
-    return value;
-}
 function alignmentAttrs(alignment) {
     const parts = [];
-    if (alignment.horizontal !== undefined && alignment.horizontal !== 'general') {
-        parts.push(`horizontal="${checkedToken(alignment.horizontal, isHorizontalAlignment, 'horizontal alignment')}"`);
-    }
-    if (alignment.vertical !== undefined) {
-        parts.push(`vertical="${checkedToken(alignment.vertical, isVerticalAlignment, 'vertical alignment')}"`);
-    }
-    if (alignment.textRotation !== undefined && alignment.textRotation !== 0) {
-        parts.push(`textRotation="${numberAttr(alignment.textRotation)}"`);
-    }
-    if (alignment.wrapText)
-        parts.push('wrapText="1"');
-    if (alignment.indent !== undefined && alignment.indent !== 0) {
-        parts.push(`indent="${numberAttr(alignment.indent)}"`);
-    }
-    if (alignment.shrinkToFit)
-        parts.push('shrinkToFit="1"');
-    if (alignment.readingOrder !== undefined && alignment.readingOrder !== 0) {
-        parts.push(`readingOrder="${numberAttr(alignment.readingOrder)}"`);
+    for (const facet of ALIGNMENT_FACETS) {
+        switch (facet.kind) {
+            case 'token': {
+                const value = alignment[facet.key];
+                if (value === undefined || value === facet.omit)
+                    break;
+                parts.push(`${facet.key}="${checkedToken(value, facet.isValid, facet.label)}"`);
+                break;
+            }
+            case 'number': {
+                const value = alignment[facet.key];
+                if (value === undefined || value === 0)
+                    break;
+                parts.push(`${facet.key}="${numberText(value)}"`);
+                break;
+            }
+            case 'flag':
+                if (alignment[facet.key])
+                    parts.push(`${facet.key}="1"`);
+                break;
+        }
     }
     return parts.join(' ');
 }
@@ -349,15 +333,15 @@ export function fontXml(font, nameTag = 'name') {
         parts.push(`<vertAlign val="${checkedToken(font.vertAlign, isFontVerticalAlignment, 'font vertical alignment')}"/>`);
     }
     if (font.size !== undefined)
-        parts.push(`<sz val="${numberAttr(font.size)}"/>`);
+        parts.push(`<sz val="${numberText(font.size)}"/>`);
     if (font.color !== undefined)
         parts.push(`<color ${colorAttrs(font.color)}/>`);
     if (font.name !== undefined)
         parts.push(`<${nameTag} val="${escapeAttr(font.name)}"/>`);
     if (font.family !== undefined)
-        parts.push(`<family val="${numberAttr(font.family)}"/>`);
+        parts.push(`<family val="${numberText(font.family)}"/>`);
     if (font.charset !== undefined)
-        parts.push(`<charset val="${numberAttr(font.charset)}"/>`);
+        parts.push(`<charset val="${numberText(font.charset)}"/>`);
     if (font.scheme !== undefined && font.scheme !== 'none')
         parts.push(`<scheme val="${checkedToken(font.scheme, isFontScheme, 'font scheme')}"/>`);
     return parts.join('');
@@ -380,18 +364,18 @@ function dxfXml(style) {
 }
 function gradientFillXml(fill) {
     const attrs = (fill.gradient === 'path' ? ' type="path"' : '') +
-        (fill.degree ? ` degree="${numberAttr(fill.degree)}"` : '') +
+        (fill.degree ? ` degree="${numberText(fill.degree)}"` : '') +
         insetAttr('left', fill.left) +
         insetAttr('right', fill.right) +
         insetAttr('top', fill.top) +
         insetAttr('bottom', fill.bottom);
     const stops = fill.stops
-        .map((stop) => `<stop position="${numberAttr(stop.position)}"><color ${colorAttrs(stop.color)}/></stop>`)
+        .map((stop) => `<stop position="${numberText(stop.position)}"><color ${colorAttrs(stop.color)}/></stop>`)
         .join('');
     return `<gradientFill${attrs}>${stops}</gradientFill>`;
 }
 function insetAttr(name, value) {
-    return value ? ` ${name}="${numberAttr(value)}"` : '';
+    return value ? ` ${name}="${numberText(value)}"` : '';
 }
 function underlineXml(underline) {
     if (underline === undefined || underline === false || underline === 'none')
@@ -400,12 +384,6 @@ function underlineXml(underline) {
         return '<u/>';
     return `<u val="${checkedToken(underline, isNamedUnderlineStyle, 'underline style')}"/>`;
 }
-function numberAttr(value) {
-    if (!Number.isFinite(value)) {
-        throw new AuthoringError(`cannot serialise a non-finite font metric (${value})`);
-    }
-    return String(value);
-}
 function borderXml(border) {
     const attrs = (border.diagonalUp ? ' diagonalUp="1"' : '') + (border.diagonalDown ? ' diagonalDown="1"' : '');
     return (`<border${attrs}>` +

package/dist/io/xlsx/tables.js

@@ -1,6 +1,7 @@
-import { decodeRange, encodeAddress } from '../../core/address.js';
+import { encodeAddress, tryDecodeRange } from '../../core/address.js';
 import { isTotalsRowFunction, } from '../../core/table.js';
-import { boolPresent, localName, numInteger, parseXml } from '../../xml/xml-read.js';
+import { parseXml, TextCapture } from '../../xml/xml-read.js';
+import { boolPresent, localName, numInteger } from '../../xml/xml-scan.js';
 import { boolAttr, escapeAttr, escapeText, XML_DECLARATION } from '../../xml/xml.js';
 import { NS } from './relationships.js';
 export function tableXml(table, id) {
@@ -65,10 +66,9 @@ export function parseTable(xml) {
     let style;
     let hasAutoFilter = false;
     const columns = [];
-    let inTotalsFormula = false;
-    let totalsFormula = '';
+    const totalsFormula = new TextCapture('totalsRowFormula');
     parseXml(xml, {
-        onOpen(elementName, attrs) {
+        onOpen(elementName, attrs, selfClosing) {
             switch (localName(elementName)) {
                 case 'table':
                     name = attrs.name ?? attrs.displayName;
@@ -112,27 +112,28 @@ export function parseTable(xml) {
                     break;
                 }
                 case 'totalsRowFormula':
-                    inTotalsFormula = true;
-                    totalsFormula = '';
+                    totalsFormula.open('totalsRowFormula', selfClosing);
                     break;
             }
         },
         onText(text) {
-            if (inTotalsFormula)
-                totalsFormula += text;
+            totalsFormula.text(text);
         },
         onClose(elementName) {
-            if (localName(elementName) !== 'totalsRowFormula')
+            const formula = totalsFormula.close(localName(elementName));
+            if (formula === undefined)
                 return;
-            inTotalsFormula = false;
             const column = columns[columns.length - 1];
             if (column !== undefined)
-                column.totalsRowFormula = totalsFormula;
+                column.totalsRowFormula = formula;
         },
     });
     if (name === undefined || ref === undefined || columns.length === 0)
         return undefined;
-    const { top, left, bottom } = decodeRange(ref);
+    const decoded = tryDecodeRange(ref);
+    if (decoded === undefined)
+        return undefined;
+    const { top, left, bottom } = decoded;
     if (top === undefined || left === undefined || bottom === undefined)
         return undefined;
     const headerRow = headerRowCount !== 0;

package/dist/io/xlsx/theme-xml.js

@@ -1,5 +1,5 @@
-import { DEFAULT_THEME_COLOR_SCHEME, normalizeThemeColor, } from '../../core/theme.js';
-import { decodeEntities } from '../../xml/xml-read.js';
+import { DEFAULT_THEME_COLOR_SCHEME, isThemeColorSlot, normalizeThemeColor, } from '../../core/theme.js';
+import { decodeEntities } from '../../xml/xml-scan.js';
 import { escapeAttr } from '../../xml/xml.js';
 const SCHEME_SLOT = new RegExp('<a:(dk1|lt1|dk2|lt2|accent[1-6]|hlink|folHlink)\\b[^>]*>' + '\\s*<a:(srgbClr|sysClr)\\b([^>]*)>', 'g');
 export function parseThemeColorScheme(themeXml) {
@@ -9,6 +9,8 @@ export function parseThemeColorScheme(themeXml) {
     const scheme = {};
     for (const match of (block[1] ?? '').matchAll(SCHEME_SLOT)) {
         const slot = match[1];
+        if (slot === undefined || !isThemeColorSlot(slot))
+            continue;
         const attrs = match[3] ?? '';
         const source = match[2] === 'sysClr' ? /\blastClr="([^"]*)"/ : /\bval="([^"]*)"/;
         const value = source.exec(attrs)?.[1];
@@ -58,8 +60,7 @@ export function applyThemeOverrides(baseXml, overrides) {
             const authored = colors[slot];
             const inner = authored !== undefined
                 ? `<a:srgbClr val="${normalizeThemeColor(authored)}"/>`
-                : (sourceElements[slot] ??
-                    `<a:srgbClr val="${DEFAULT_THEME_COLOR_SCHEME[slot]}"/>`);
+                : (sourceElements[slot] ?? `<a:srgbClr val="${DEFAULT_THEME_COLOR_SCHEME[slot]}"/>`);
             return `<a:${slot}>${inner}</a:${slot}>`;
         }).join('');
         xml = replaceBlockBody(xml, 'clrScheme', body);
@@ -78,7 +79,9 @@ function parseThemeColorElements(themeXml) {
     const elements = {};
     const pattern = /<a:(dk1|lt1|dk2|lt2|accent[1-6]|hlink|folHlink)>([\s\S]*?)<\/a:\1>|<a:(dk1|lt1|dk2|lt2|accent[1-6]|hlink|folHlink)\/>/g;
     for (const match of (block[1] ?? '').matchAll(pattern)) {
-        const slot = (match[1] ?? match[3]);
+        const slot = match[1] ?? match[3];
+        if (slot === undefined || !isThemeColorSlot(slot))
+            continue;
         const inner = match[2];
         if (inner !== undefined && inner !== '')
             elements[slot] = inner;

package/dist/io/xlsx/threaded-comments.js

@@ -1,7 +1,8 @@
 import { encodeAddress, tryDecodeCellRef } from '../../core/address.js';
 import { MENTION_OFFSET_MAX, } from '../../core/comment-thread.js';
-import { boolStrict, decodeSpreadsheetText, localName, numInteger, parseXml, } from '../../xml/xml-read.js';
-import { escapeAttr, escapeSpreadsheetText, XML_DECLARATION } from '../../xml/xml.js';
+import { parseXml, TextCapture } from '../../xml/xml-read.js';
+import { boolStrict, decodeSpreadsheetText, localName, numInteger, } from '../../xml/xml-scan.js';
+import { escapeAttr, escapeSpreadsheetText, textAttr, XML_DECLARATION } from '../../xml/xml.js';
 import { THREADED_COMMENTS_NS } from './namespaces.js';
 export function parsePersons(xml) {
     const persons = [];
@@ -27,33 +28,33 @@ export function parseThreadedComments(xml) {
     const messages = [];
     let open;
     let mentions = [];
-    let inText = false;
     let text = '';
+    const capture = new TextCapture('text');
     parseXml(xml, {
-        onOpen(name, attrs) {
+        onOpen(name, attrs, selfClosing) {
             const local = localName(name);
             if (local === 'threadedComment') {
                 open = attrs;
                 text = '';
                 mentions = [];
             }
-            else if (local === 'text' && open !== undefined) {
-                inText = true;
-            }
-            else if (local === 'mention' && open !== undefined) {
-                const mention = mentionFrom(attrs);
-                if (mention !== undefined)
-                    mentions.push(mention);
+            else if (open !== undefined) {
+                capture.open(local, selfClosing);
+                if (local === 'mention') {
+                    const mention = mentionFrom(attrs);
+                    if (mention !== undefined)
+                        mentions.push(mention);
+                }
             }
         },
         onText(chunk) {
-            if (inText)
-                text += chunk;
+            capture.text(chunk);
         },
         onClose(name) {
             const local = localName(name);
-            if (local === 'text') {
-                inText = false;
+            const body = capture.close(local);
+            if (body !== undefined) {
+                text = body;
             }
             else if (local === 'threadedComment') {
                 if (open !== undefined) {
@@ -159,8 +160,8 @@ export function threadedCommentsXml(threads) {
         `<ThreadedComments xmlns="${THREADED_COMMENTS_NS}">${messages.join('')}</ThreadedComments>`);
 }
 function threadedCommentXml(ref, comment, tail) {
-    const date = comment.date === undefined ? '' : ` dT="${escapeAttr(comment.date)}"`;
-    const person = comment.personId === undefined ? '' : ` personId="${escapeAttr(comment.personId)}"`;
+    const date = textAttr('dT', comment.date);
+    const person = textAttr('personId', comment.personId);
     return (`<threadedComment ref="${escapeAttr(ref)}"${date}${person} id="${escapeAttr(comment.id)}"${tail}>` +
         `<text>${escapeSpreadsheetText(comment.text)}</text>` +
         mentionsXml(comment.mentions) +
@@ -184,8 +185,8 @@ function writableOffset(value) {
 }
 export function personsXml(persons) {
     const entries = persons.map((person) => {
-        const userId = person.userId === undefined ? '' : ` userId="${escapeAttr(person.userId)}"`;
-        const providerId = person.providerId === undefined ? '' : ` providerId="${escapeAttr(person.providerId)}"`;
+        const userId = textAttr('userId', person.userId);
+        const providerId = textAttr('providerId', person.providerId);
         return (`<person displayName="${escapeAttr(person.displayName)}"` +
             ` id="${escapeAttr(person.id)}"${userId}${providerId}/>`);
     });