@shbernal/ts-xlsx 2.0.0 → 2.1.0

package/dist/io/xlsx/styles.js

@@ -1,8 +1,7 @@
 import { isBorderStyle, isFillPatternType, isFontScheme, isFontVerticalAlignment, isHorizontalAlignment, isNamedUnderlineStyle, isVerticalAlignment, } 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 { 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,12 +279,6 @@ 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') {
@@ -307,17 +288,17 @@ function alignmentAttrs(alignment) {
         parts.push(`vertical="${checkedToken(alignment.vertical, isVerticalAlignment, 'vertical alignment')}"`);
     }
     if (alignment.textRotation !== undefined && alignment.textRotation !== 0) {
-        parts.push(`textRotation="${numberAttr(alignment.textRotation)}"`);
+        parts.push(`textRotation="${numberText(alignment.textRotation)}"`);
     }
     if (alignment.wrapText)
         parts.push('wrapText="1"');
     if (alignment.indent !== undefined && alignment.indent !== 0) {
-        parts.push(`indent="${numberAttr(alignment.indent)}"`);
+        parts.push(`indent="${numberText(alignment.indent)}"`);
     }
     if (alignment.shrinkToFit)
         parts.push('shrinkToFit="1"');
     if (alignment.readingOrder !== undefined && alignment.readingOrder !== 0) {
-        parts.push(`readingOrder="${numberAttr(alignment.readingOrder)}"`);
+        parts.push(`readingOrder="${numberText(alignment.readingOrder)}"`);
     }
     return parts.join(' ');
 }
@@ -349,15 +330,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 +361,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 +381,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,6 @@
-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 { boolPresent, localName, numInteger, parseXml, TextCapture } from '../../xml/xml-read.js';
 import { boolAttr, escapeAttr, escapeText, XML_DECLARATION } from '../../xml/xml.js';
 import { NS } from './relationships.js';
 export function tableXml(table, id) {
@@ -65,10 +65,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 +111,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,4 +1,4 @@
-import { DEFAULT_THEME_COLOR_SCHEME, normalizeThemeColor, } from '../../core/theme.js';
+import { DEFAULT_THEME_COLOR_SCHEME, isThemeColorSlot, normalizeThemeColor, } from '../../core/theme.js';
 import { decodeEntities } from '../../xml/xml-read.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');
@@ -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,7 @@
 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 { boolStrict, decodeSpreadsheetText, localName, numInteger, parseXml, TextCapture, } from '../../xml/xml-read.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 +27,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 +159,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 +184,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}/>`);
     });

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

@@ -1,6 +1,7 @@
 import { mangleFormula, quoteSheetName } from '../../core/formula.js';
 import { WORKBOOK_PROTECTION_CREDENTIAL_ATTRS } from '../../core/workbook-protection.js';
-import { escapeAttr, escapeText, XML_DECLARATION } from '../../xml/xml.js';
+import { isVisibility } from '../../core/worksheet.js';
+import { checkedToken, escapeAttr, escapeText, numAttr, textAttr, XML_DECLARATION, } from '../../xml/xml.js';
 import { extensionOf, relativePartPath, THEME_PART_PATH } from '../opc/part-paths.js';
 import { relationship, relationshipsPart } from '../opc/rels.js';
 import { imageContentType } from './images.js';
@@ -102,14 +103,16 @@ export function rootRelsXml(rootRefs) {
         relationship('rId1', REL.officeDocument, 'xl/workbook.xml'),
         relationship('rId2', REL.coreProps, 'docProps/core.xml'),
         relationship('rId3', REL.extProps, 'docProps/app.xml'),
-        ...rootRefs.map((ref, i) => relationship(`rId${4 + i}`, ref.relType, escapeAttr(ref.entryPath))),
+        ...rootRefs.map((ref, i) => relationship(`rId${4 + i}`, ref.relType, ref.entryPath)),
     ]);
 }
 export function workbookXml(workbook, preservedRels, pivots) {
     const sheets = workbook.worksheets;
     const entries = sheets
         .map((sheet, i) => {
-        const state = sheet.state === 'visible' ? '' : ` state="${sheet.state}"`;
+        const state = sheet.state === 'visible'
+            ? ''
+            : ` state="${checkedToken(sheet.state, isVisibility, 'sheet visibility')}"`;
         return `<sheet name="${escapeAttr(sheet.name)}" sheetId="${sheet.id}"${state} r:id="rId${i + 1}"/>`;
     })
         .join('');
@@ -128,11 +131,14 @@ export function workbookXml(workbook, preservedRels, pivots) {
 function bookViewsXml(workbook) {
     const view = workbook.view;
     const activeTab = workbook.activeTabIndex;
-    const attrs = (view.visibility !== undefined && view.visibility !== 'visible'
-        ? ` visibility="${view.visibility}"`
-        : '') +
+    const attrs = (view.visibility === undefined || view.visibility === 'visible'
+        ? ''
+        : ` visibility="${checkedToken(view.visibility, isVisibility, 'window visibility')}"`) +
         (view.minimized ? ' minimized="1"' : '') +
-        ` xWindow="${view.x}" yWindow="${view.y}" windowWidth="${view.width}" windowHeight="${view.height}"` +
+        numAttr('xWindow', view.x) +
+        numAttr('yWindow', view.y) +
+        numAttr('windowWidth', view.width) +
+        numAttr('windowHeight', view.height) +
         (activeTab === 0 ? '' : ` activeTab="${activeTab}"`);
     return `<bookViews><workbookView${attrs}/></bookViews>`;
 }
@@ -192,7 +198,7 @@ function definedNamesXml(workbook) {
         const scopeAttr = name.scope === undefined
             ? ''
             : ` localSheetId="${sheets.findIndex((sheet) => sheet.name === name.scope)}"`;
-        const commentAttr = name.comment === undefined ? '' : ` comment="${escapeAttr(name.comment)}"`;
+        const commentAttr = textAttr('comment', name.comment);
         const hiddenAttr = name.hidden ? ' hidden="1"' : '';
         return (`<definedName name="${escapeAttr(name.name)}"${scopeAttr}${commentAttr}${hiddenAttr}>` +
             `${escapeText(mangleFormula(name.refersTo))}</definedName>`);

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

@@ -2,9 +2,10 @@ import { decodeRange, encodeAddress } from '../../core/address.js';
 import { DEFAULT_DATE_NUMFMT, dateToSerial } from '../../core/date.js';
 import { mangleFormula } from '../../core/formula.js';
 import { NAMED_STYLE_ID } from '../../core/internal.js';
+import { CELL_STYLE_FACETS, pickStyleFacets } from '../../core/style.js';
 import { detectValueType, isDataTableFormulaValue, isErrorValue, isFormulaValue, isHyperlinkValue, isRichTextValue, isSharedFormulaValue, } from '../../core/value.js';
 import { AuthoringError, InternalError } from '../../errors.js';
-import { escapeAttr, escapeSpreadsheetText, escapeText, numberText, textElement, XML_DECLARATION, } from '../../xml/xml.js';
+import { assertWritableNumber, escapeAttr, escapeSpreadsheetText, escapeText, numberText, textAttr, textElement, XML_DECLARATION, } from '../../xml/xml.js';
 import { relativePartPath } from '../opc/part-paths.js';
 import { relationship, relationshipsPart } from '../opc/rels.js';
 import { conditionalFormattingsExtXml, conditionalFormattingsXml } from './conditional-formatting.js';
@@ -136,16 +137,20 @@ export function renderRow(entry, ctx) {
     return { xml: `<row r="${number}"${attrs}>${cellsXml}</row>`, minCol, maxCol };
 }
 function composeCellStyle(cell, rowFill, colDef) {
-    return {
-        fill: cell.fill ?? rowFill ?? colDef?.fill,
-        numFmt: cell.numFmt ?? colDef?.numFmt ?? dateDefaultNumFmt(cell.value),
-        font: cell.font ?? colDef?.font,
-        border: cell.border ?? colDef?.border,
-        alignment: cell.alignment ?? colDef?.alignment,
-        protection: cell.protection ?? colDef?.protection,
-        quotePrefix: cell.quotePrefix,
-        xfId: cell[NAMED_STYLE_ID],
-    };
+    const style = {};
+    for (const facet of CELL_STYLE_FACETS)
+        inheritFacet(style, facet, cell, colDef);
+    style.fill = cell.fill ?? rowFill ?? colDef?.fill;
+    style.numFmt = cell.numFmt ?? colDef?.numFmt ?? dateDefaultNumFmt(cell.value);
+    if (cell.quotePrefix !== undefined)
+        style.quotePrefix = cell.quotePrefix;
+    const xfId = cell[NAMED_STYLE_ID];
+    if (xfId !== undefined)
+        style.xfId = xfId;
+    return style;
+}
+function inheritFacet(target, key, cell, colDef) {
+    target[key] = cell[key] ?? colDef?.[key];
 }
 function worksheetExtLstXml(sheet, slicerRelIds) {
     const exts = [
@@ -228,7 +233,7 @@ export function worksheetRelsXml(tables, drawing, comments, threadedComments, pr
         ...preservedReferences.map((reference) => relationship(reference.relId, reference.relType, escapeAttr(relativePartPath('xl/worksheets/sheet1.xml', reference.entryPath)))),
         ...hyperlinks
             .filter((link) => link.relId !== undefined && link.target !== undefined)
-            .map((link) => relationship(link.relId, REL.hyperlink, escapeAttr(link.target), {
+            .map((link) => relationship(link.relId, REL.hyperlink, link.target, {
             external: true,
         })),
     ];
@@ -243,12 +248,16 @@ function sheetFormatPr(properties, outlineLevel) {
     }
     if (properties.defaultRowHeight !== undefined)
         attrs += ' customHeight="1"';
-    if (outlineLevel.col > 0)
-        attrs += ` outlineLevelCol="${outlineLevel.col}"`;
-    if (outlineLevel.row > 0)
-        attrs += ` outlineLevelRow="${outlineLevel.row}"`;
+    attrs += outlineAttr('outlineLevelCol', outlineLevel.col);
+    attrs += outlineAttr('outlineLevelRow', outlineLevel.row);
     return `<sheetFormatPr${attrs}/>`;
 }
+function outlineAttr(name, level) {
+    if (level === undefined)
+        return '';
+    const text = numberText(level);
+    return level > 0 ? ` ${name}="${text}"` : '';
+}
 function maxColumnOutlineLevel(sheet) {
     let max = 0;
     for (const column of sheet.columns())
@@ -285,22 +294,16 @@ function colBody(properties, styles) {
         attrs += ' hidden="1"';
         meaningful = true;
     }
-    if (properties.outlineLevel !== undefined && properties.outlineLevel > 0) {
-        attrs += ` outlineLevel="${properties.outlineLevel}"`;
+    const outline = outlineAttr('outlineLevel', properties.outlineLevel);
+    if (outline !== '') {
+        attrs += outline;
         meaningful = true;
     }
     if (properties.collapsed) {
         attrs += ' collapsed="1"';
         meaningful = true;
     }
-    const style = styles.styleId({
-        fill: properties.fill,
-        numFmt: properties.numFmt,
-        font: properties.font,
-        border: properties.border,
-        alignment: properties.alignment,
-        protection: properties.protection,
-    });
+    const style = styles.styleId(pickStyleFacets(properties));
     if (style !== 0) {
         attrs += ` style="${style}"`;
         meaningful = true;
@@ -315,9 +318,7 @@ function rowAttrs(properties, styles, collapsedSummary) {
         attrs += ` ht="${numberText(properties.height)}" customHeight="1"`;
     if (properties.hidden)
         attrs += ' hidden="1"';
-    if (properties.outlineLevel !== undefined && properties.outlineLevel > 0) {
-        attrs += ` outlineLevel="${properties.outlineLevel}"`;
-    }
+    attrs += outlineAttr('outlineLevel', properties.outlineLevel);
     if (properties.collapsed || collapsedSummary)
         attrs += ' collapsed="1"';
     const style = styles.styleId({ fill: properties.fill });
@@ -331,6 +332,7 @@ function scanRowOutline(sheet) {
     let maxLevel = 0;
     for (const { number, properties } of sheet.rows()) {
         const rowLevel = properties?.outlineLevel ?? 0;
+        assertWritableNumber(rowLevel);
         level.set(number, rowLevel);
         hidden.set(number, properties?.hidden ?? false);
         if (rowLevel > maxLevel)
@@ -408,12 +410,7 @@ function cellXml(cell, style, shared, sharedStrings) {
     throw new InternalError(`writing a ${detectValueType(value)} cell value has no arm: every CellValue kind is handled above`);
 }
 function hasOwnStyle(cell) {
-    return (cell.fill !== undefined ||
-        cell.numFmt !== undefined ||
-        cell.font !== undefined ||
-        cell.border !== undefined ||
-        cell.alignment !== undefined ||
-        cell.protection !== undefined ||
+    return (CELL_STYLE_FACETS.some((facet) => cell[facet] !== undefined) ||
         cell.quotePrefix === true ||
         cell[NAMED_STYLE_ID] !== undefined);
 }
@@ -430,8 +427,8 @@ function cellFormulaXml(ref, s, value, shared) {
         const attrs = `ref="${escapeAttr(value.ref)}"` +
             ` dt2D="${value.dataTable2D ? 1 : 0}"` +
             ` dtr="${value.dataTableRow ? 1 : 0}"` +
-            (value.r1 !== undefined ? ` r1="${escapeAttr(value.r1)}"` : '') +
-            (value.r2 !== undefined ? ` r2="${escapeAttr(value.r2)}"` : '');
+            textAttr('r1', value.r1) +
+            textAttr('r2', value.r2);
         return formulaBodyXml(ref, s, `<f t="dataTable" ${attrs}/>`, value.result);
     }
     if (isFormulaValue(value)) {