@shbernal/ts-xlsx 1.3.1 → 2.1.0

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

@@ -0,0 +1,145 @@
+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');
+export function parseThemeColorScheme(themeXml) {
+    const block = /<a:clrScheme\b[^>]*>([\s\S]*?)<\/a:clrScheme>/.exec(themeXml);
+    if (block === null)
+        return {};
+    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];
+        if (value !== undefined && /^[0-9a-fA-F]{6}$/.test(value))
+            scheme[slot] = value;
+    }
+    return scheme;
+}
+export function parseThemeFontScheme(themeXml) {
+    const block = /<a:fontScheme\b[^>]*>([\s\S]*?)<\/a:fontScheme>/.exec(themeXml);
+    if (block === null)
+        return {};
+    const face = (which) => {
+        const font = new RegExp(`<a:${which}\\b[^>]*>([\\s\\S]*?)</a:${which}>`).exec(block[1] ?? '');
+        const typeface = /<a:latin\b[^>]*\btypeface="([^"]*)"/.exec(font?.[1] ?? '')?.[1];
+        return typeface === undefined ? undefined : decodeEntities(typeface);
+    };
+    const scheme = {};
+    const major = face('majorFont');
+    const minor = face('minorFont');
+    if (major !== undefined)
+        scheme.major = major;
+    if (minor !== undefined)
+        scheme.minor = minor;
+    return scheme;
+}
+const SCHEME_ELEMENT_ORDER = [
+    'dk1',
+    'lt1',
+    'dk2',
+    'lt2',
+    'accent1',
+    'accent2',
+    'accent3',
+    'accent4',
+    'accent5',
+    'accent6',
+    'hlink',
+    'folHlink',
+];
+export function applyThemeOverrides(baseXml, overrides) {
+    let xml = baseXml;
+    const colors = overrides.colors ?? {};
+    if (Object.keys(colors).length > 0) {
+        const sourceElements = parseThemeColorElements(baseXml);
+        const body = SCHEME_ELEMENT_ORDER.map((slot) => {
+            const authored = colors[slot];
+            const inner = authored !== undefined
+                ? `<a:srgbClr val="${normalizeThemeColor(authored)}"/>`
+                : (sourceElements[slot] ?? `<a:srgbClr val="${DEFAULT_THEME_COLOR_SCHEME[slot]}"/>`);
+            return `<a:${slot}>${inner}</a:${slot}>`;
+        }).join('');
+        xml = replaceBlockBody(xml, 'clrScheme', body);
+    }
+    const { major, minor } = overrides.fonts ?? {};
+    if (major !== undefined)
+        xml = replaceLatinTypeface(xml, 'majorFont', major);
+    if (minor !== undefined)
+        xml = replaceLatinTypeface(xml, 'minorFont', minor);
+    return xml;
+}
+function parseThemeColorElements(themeXml) {
+    const block = /<a:clrScheme\b[^>]*>([\s\S]*?)<\/a:clrScheme>/.exec(themeXml);
+    if (block === null)
+        return {};
+    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];
+        if (slot === undefined || !isThemeColorSlot(slot))
+            continue;
+        const inner = match[2];
+        if (inner !== undefined && inner !== '')
+            elements[slot] = inner;
+    }
+    return elements;
+}
+function replaceBlockBody(xml, name, body) {
+    const pattern = new RegExp(`(<a:${name}\\b[^>]*>)[\\s\\S]*?(</a:${name}>)`);
+    return xml.replace(pattern, (_all, open, close) => `${open}${body}${close}`);
+}
+function replaceLatinTypeface(xml, which, typeface) {
+    const pattern = new RegExp(`(<a:${which}\\b[^>]*>[\\s\\S]*?<a:latin\\b)[^>]*(/>)`);
+    return xml.replace(pattern, (_all, open, close) => `${open} typeface="${escapeAttr(typeface)}"${close}`);
+}
+export const DEFAULT_THEME_XML = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n' +
+    '<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">' +
+    '<a:themeElements>' +
+    '<a:clrScheme name="Office">' +
+    '<a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1>' +
+    '<a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1>' +
+    '<a:dk2><a:srgbClr val="44546A"/></a:dk2>' +
+    '<a:lt2><a:srgbClr val="E7E6E6"/></a:lt2>' +
+    '<a:accent1><a:srgbClr val="4472C4"/></a:accent1>' +
+    '<a:accent2><a:srgbClr val="ED7D31"/></a:accent2>' +
+    '<a:accent3><a:srgbClr val="A5A5A5"/></a:accent3>' +
+    '<a:accent4><a:srgbClr val="FFC000"/></a:accent4>' +
+    '<a:accent5><a:srgbClr val="5B9BD5"/></a:accent5>' +
+    '<a:accent6><a:srgbClr val="70AD47"/></a:accent6>' +
+    '<a:hlink><a:srgbClr val="0563C1"/></a:hlink>' +
+    '<a:folHlink><a:srgbClr val="954F72"/></a:folHlink>' +
+    '</a:clrScheme>' +
+    '<a:fontScheme name="Office">' +
+    '<a:majorFont><a:latin typeface="Calibri Light" panose="020F0302020204030204"/><a:ea typeface=""/><a:cs typeface=""/></a:majorFont>' +
+    '<a:minorFont><a:latin typeface="Calibri" panose="020F0502020204030204"/><a:ea typeface=""/><a:cs typeface=""/></a:minorFont>' +
+    '</a:fontScheme>' +
+    '<a:fmtScheme name="Office">' +
+    '<a:fillStyleLst>' +
+    '<a:solidFill><a:schemeClr val="phClr"/></a:solidFill>' +
+    '<a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:lumMod val="110000"/><a:satMod val="105000"/><a:tint val="67000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="103000"/><a:tint val="73000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="105000"/><a:satMod val="109000"/><a:tint val="81000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill>' +
+    '<a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:satMod val="103000"/><a:lumMod val="102000"/><a:tint val="94000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:satMod val="110000"/><a:lumMod val="100000"/><a:shade val="100000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:lumMod val="99000"/><a:satMod val="120000"/><a:shade val="78000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill>' +
+    '</a:fillStyleLst>' +
+    '<a:lnStyleLst>' +
+    '<a:ln w="6350" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>' +
+    '<a:ln w="12700" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>' +
+    '<a:ln w="19050" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/><a:miter lim="800000"/></a:ln>' +
+    '</a:lnStyleLst>' +
+    '<a:effectStyleLst>' +
+    '<a:effectStyle><a:effectLst/></a:effectStyle>' +
+    '<a:effectStyle><a:effectLst/></a:effectStyle>' +
+    '<a:effectStyle><a:effectLst><a:outerShdw blurRad="57150" dist="19050" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="63000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle>' +
+    '</a:effectStyleLst>' +
+    '<a:bgFillStyleLst>' +
+    '<a:solidFill><a:schemeClr val="phClr"/></a:solidFill>' +
+    '<a:solidFill><a:schemeClr val="phClr"><a:tint val="95000"/><a:satMod val="170000"/></a:schemeClr></a:solidFill>' +
+    '<a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="93000"/><a:satMod val="150000"/><a:shade val="98000"/><a:lumMod val="102000"/></a:schemeClr></a:gs><a:gs pos="50000"><a:schemeClr val="phClr"><a:tint val="98000"/><a:satMod val="130000"/><a:shade val="90000"/><a:lumMod val="103000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="63000"/><a:satMod val="120000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="5400000" scaled="0"/></a:gradFill>' +
+    '</a:bgFillStyleLst>' +
+    '</a:fmtScheme>' +
+    '</a:themeElements>' +
+    '<a:objectDefaults/>' +
+    '<a:extraClrSchemeLst/>' +
+    '</a:theme>';

package/dist/io/xlsx/threaded-comments.d.ts

@@ -1,5 +1,5 @@
-import { type CommentThread, type Person } from '../../core/comment-thread.ts';
-/** A registered author of threaded comments — one `<person>` of `xl/persons/person.xml`. */
+import { type CommentThread, type MentionRef, type Person } from '../../core/comment-thread.ts';
+/** A registered author of threaded comments: one `<person>` of `xl/persons/person.xml`. */
 export interface ParsedPerson {
     /** Brace-wrapped GUID a message's `personId` points at. */
     readonly id: string;
@@ -10,26 +10,17 @@ export interface ParsedPerson {
     readonly providerId?: string;
 }
 /**
- * One `<mention>` of a message's `<mentions>` block: who was named, and the run of the message text
- * that renders as the mention chip.
+ * One `<mention>` of a message's `<mentions>` block: the model's own {@link MentionRef}, which is
+ * exactly the four wire attributes with nothing resolved yet. Declaring it a second time here would
+ * be two places for the offset convention to drift, and the offsets are what a spreadsheet app
+ * highlights with.
  *
- * All four wire attributes are required (Excel rejects a file missing any), and note the lowercase `p`
- * in `mentionpersonId` — the capitalised spelling is not a declared attribute.
+ * All four attributes are required (Excel rejects a file missing any), and note the lowercase `p`
+ * in `mentionpersonId`; the capitalised spelling is not a declared attribute. The person id is that
+ * attribute's value; every other field is named as the model names it.
  */
-export interface ParsedMention {
-    /** The mentioned {@link ParsedPerson.id}, from `mentionpersonId`. */
-    readonly personId: string;
-    /** Excel's own id for the mention itself. Absent only in a file that omitted it. */
-    readonly mentionId?: string;
-    /**
-     * 0-based character offset into the message text. Verified against desktop Excel by rendering: the
-     * chip covers exactly `[startIndex, startIndex + length)` of the text.
-     */
-    readonly startIndex: number;
-    /** The mention's length in characters, **including the leading `@`** (`@Grace Hopper` is 13). */
-    readonly length: number;
-}
-/** One message of a threaded conversation — a `<threadedComment>` of a `threadedComment{n}.xml`. */
+export type ParsedMention = MentionRef;
+/** One message of a threaded conversation: a `<threadedComment>` of a `threadedComment{n}.xml`. */
 export interface ParsedThreadedComment {
     /** A1 reference of the cell the whole thread anchors to; every message of a thread repeats it. */
     readonly ref: string;
@@ -39,7 +30,7 @@ export interface ParsedThreadedComment {
     readonly personId?: string;
     /**
      * The `dT` timestamp verbatim. Excel writes local wall-clock with fractional seconds and no
-     * timezone (`2026-07-24T10:56:41.72`), which is not a round-trippable instant — keeping the
+     * timezone (`2026-07-24T10:56:41.72`), which is not a round-trippable instant. Keeping the
      * string spares the reader from inventing a zone the file never stated.
      */
     readonly date?: string;
@@ -48,7 +39,7 @@ export interface ParsedThreadedComment {
     readonly parentId?: string;
     /**
      * The `done` flag exactly as written. Excel puts it on the head alone and omits it entirely on an
-     * open thread (never `done="0"`), so read a thread's resolved state off its head — a reply's
+     * open thread (never `done="0"`), so read a thread's resolved state off its head: a reply's
      * `false` here means "did not say", not "not resolved".
      */
     readonly done: boolean;
@@ -57,12 +48,12 @@ export interface ParsedThreadedComment {
 }
 /**
  * Parse `xl/persons/person.xml` into its registered authors, in document order. Order carries no
- * meaning — Excel re-sorts the list by person id when it saves — so nothing may depend on it. An
+ * meaning, because Excel re-sorts the list by person id when it saves, so nothing may depend on it. An
  * entry without an `id` is skipped: no message could reference it.
  */
 export declare function parsePersons(xml: string): ParsedPerson[];
 /**
- * Parse a `threadedComment{n}.xml` part into its messages, in document order — thread order, with
+ * Parse a `threadedComment{n}.xml` part into its messages, in document order: thread order, with
  * each thread's replies following its head. Grouping into threads is {@link buildCommentThreads}'s
  * job; this stays faithful to the part. A message without a `ref` or `id` cannot be anchored or
  * replied to and is skipped.
@@ -74,14 +65,14 @@ export declare function parseThreadedComments(xml: string): ParsedThreadedCommen
  *
  * Document order is thread order with each thread's replies following its head, so one pass suffices: a
  * message with no `parentId` opens a thread, and a reply joins the thread its `parentId` names. A reply
- * whose parent is unknown — a dangling `parentId` no Excel file produces — opens a thread of its own
+ * whose parent is unknown (a dangling `parentId` no Excel file produces) opens a thread of its own
  * rather than being dropped, so a foreign generator's damage costs structure, never content.
  */
 export declare function buildCommentThreads(messages: readonly ParsedThreadedComment[], personById: (id: string) => Person | undefined): CommentThread[];
 /**
  * Serialise one sheet's conversations into its `xl/threadedComments/threadedComment{n}.xml` part.
  *
- * Messages are written flat, in thread order with each thread's replies after its head — the shape
+ * Messages are written flat, in thread order with each thread's replies after its head: the shape
  * {@link parseThreadedComments} reads back. The head/reply distinction the model holds as array position
  * becomes `parentId` on every reply but the head, and `done="1"` goes on the head alone: only the head
  * carries the flag on the wire, so a reply can never contradict the thread it belongs to. An open thread
@@ -92,7 +83,7 @@ export declare function buildCommentThreads(messages: readonly ParsedThreadedCom
  */
 export declare function threadedCommentsXml(threads: readonly CommentThread[]): string;
 /**
- * Serialise the workbook's identity registry into `xl/persons/person.xml` — singular and unnumbered,
+ * Serialise the workbook's identity registry into `xl/persons/person.xml`: singular and unnumbered,
  * unlike the per-sheet thread parts.
  *
  * Entries are written in registry order, which carries no meaning: Excel re-sorts the list by person id

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

@@ -1,7 +1,7 @@
-import { decodeAddress } from '../../core/address.js';
+import { encodeAddress, tryDecodeCellRef } from '../../core/address.js';
 import { MENTION_OFFSET_MAX, } from '../../core/comment-thread.js';
-import { escapeAttr, escapeText, XML_DECLARATION } from '../../xml/xml.js';
-import { boolStrict, localName, parseXml } from '../../xml/xml-read.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) {
@@ -76,7 +76,7 @@ function threadedCommentFrom(attrs, text, mentions) {
     return {
         ref,
         id,
-        text,
+        text: decodeSpreadsheetText(text),
         done: boolStrict(attrs.done),
         mentions: [...mentions],
         ...(personId !== undefined ? { personId } : {}),
@@ -86,8 +86,8 @@ function threadedCommentFrom(attrs, text, mentions) {
 }
 function mentionFrom(attrs) {
     const personId = attrs.mentionpersonId;
-    const startIndex = integerAttribute(attrs.startIndex);
-    const length = integerAttribute(attrs.length);
+    const startIndex = numInteger(attrs.startIndex);
+    const length = numInteger(attrs.length);
     if (personId === undefined || startIndex === undefined || length === undefined)
         return undefined;
     if (startIndex < 0 || length <= 0)
@@ -101,12 +101,6 @@ function mentionFrom(attrs) {
         ...(attrs.mentionId !== undefined ? { mentionId: attrs.mentionId } : {}),
     };
 }
-function integerAttribute(raw) {
-    if (raw === undefined || raw.trim() === '')
-        return undefined;
-    const value = Number(raw);
-    return Number.isInteger(value) ? value : undefined;
-}
 export function buildCommentThreads(messages, personById) {
     const threads = [];
     const commentsByHeadId = new Map();
@@ -127,14 +121,8 @@ export function buildCommentThreads(messages, personById) {
     return threads;
 }
 function anchorRef(reference) {
-    let decoded;
-    try {
-        decoded = decodeAddress(reference);
-    }
-    catch {
-        return undefined;
-    }
-    return decoded.col === undefined || decoded.row === undefined ? undefined : decoded.address;
+    const cell = tryDecodeCellRef(reference);
+    return cell === undefined ? undefined : encodeAddress(cell.col, cell.row);
 }
 function commentFrom(message, personById) {
     const author = message.personId === undefined ? undefined : personById(message.personId);
@@ -171,10 +159,10 @@ 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>${escapeText(comment.text)}</text>` +
+        `<text>${escapeSpreadsheetText(comment.text)}</text>` +
         mentionsXml(comment.mentions) +
         '</threadedComment>');
 }
@@ -196,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.d.ts

@@ -6,7 +6,7 @@ import { type SharedFormulaRole } from './shared-formulas.ts';
 import type { SharedStringTable } from './shared-strings.ts';
 import type { StyleRegistry } from './styles.ts';
 /**
- * The used-cell extent of a sheet — the top-left/bottom-right grid bounds that fold into the
+ * The used-cell extent of a sheet: the top-left/bottom-right grid bounds that fold into the
  * `<dimension>`. Rows carrying only formatting (a row height, an outline level) do not extend the
  * used range, matching how Excel records `<dimension>`, so {@link add} ignores them. A fresh extent
  * holds the `Infinity`/`-Infinity` sentinels; {@link isEmpty} reports that no used cell has been seen.
@@ -17,7 +17,7 @@ export declare class Extent {
     bottom: number;
     right: number;
     constructor(seed?: Extent);
-    /** Whether no used cell has been folded in yet — the sheet's dimension is then the lone cell `A1`. */
+    /** Whether no used cell has been folded in yet, in which case the dimension is the lone cell `A1`. */
     get isEmpty(): boolean;
     /** Fold a rendered row's used-column span into the extent. `minCol` is `Infinity` when the row
      * carried no cells (only formatting), which extends nothing. */

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

@@ -1,10 +1,11 @@
-import { decodeRange, encodeAddress, MAX_COLUMN } from '../../core/address.js';
+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, 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 = [
@@ -175,7 +180,7 @@ function validateMerges(sheet) {
                 top <= region.bottom &&
                 bottom >= region.top;
             if (overlaps) {
-                throw new AuthoringError(`merged range ${merge} overlaps table "${table.name}" (${table.range}) — Excel forbids a merge inside a table`);
+                throw new AuthoringError(`merged range ${merge} overlaps table "${table.name}" (${table.range}): Excel forbids a merge inside a table`);
             }
         }
     }
@@ -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,26 +248,25 @@ 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()) {
-        if (column.index > MAX_COLUMN)
-            continue;
+    for (const column of sheet.columns())
         max = Math.max(max, column.outlineLevel ?? 0);
-    }
     return max;
 }
 function colsXml(sheet, styles) {
     const runs = [];
     for (const { index, properties } of sheet.columns()) {
-        if (index > MAX_COLUMN)
-            continue;
         const body = colBody(properties ?? {}, styles);
         if (body === null)
             continue;
@@ -290,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;
@@ -320,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 });
@@ -336,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)
@@ -410,15 +407,10 @@ function cellXml(cell, style, shared, sharedStrings) {
     }
     if (value === null)
         return `<c r="${ref}"${s}/>`;
-    throw new InternalError(`writing a ${detectValueType(value)} cell value has no arm — every CellValue kind is handled above`);
+    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);
 }
@@ -435,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)) {
@@ -455,7 +447,7 @@ function formulaBodyXml(ref, s, f, result) {
         return `<c r="${ref}"${s} t="b">${f}<v>${result ? 1 : 0}</v></c>`;
     }
     if (typeof result === 'string') {
-        return `<c r="${ref}"${s} t="str">${f}<v>${escapeText(result)}</v></c>`;
+        return `<c r="${ref}"${s} t="str">${f}<v>${escapeSpreadsheetText(result)}</v></c>`;
     }
     if (isErrorValue(result)) {
         return `<c r="${ref}"${s} t="e">${f}<v>${result.error}</v></c>`;
@@ -465,5 +457,5 @@ function formulaBodyXml(ref, s, f, result) {
             return `<c r="${ref}"${s}>${f}</c>`;
         return `<c r="${ref}"${s}>${f}<v>${numberText(dateToSerial(result))}</v></c>`;
     }
-    throw new InternalError('writing a non-primitive formula result has no arm — every FormulaResult kind is handled above');
+    throw new InternalError('writing a non-primitive formula result has no arm: every FormulaResult kind is handled above');
 }