@shbernal/ts-xlsx 2.0.0 → 3.0.0

package/dist/io/opc/part-paths.d.ts

@@ -2,3 +2,4 @@ export declare const THEME_PART_PATH = "xl/theme/theme1.xml";
 export declare function extensionOf(partPath: string): string;
 export declare function relsPathFor(partPath: string): string;
 export declare function relativePartPath(fromPath: string, toPath: string): string;
+export declare function resolveRelativePart(basePart: string, target: string): string;

package/dist/io/opc/part-paths.js

@@ -22,3 +22,18 @@ export function relativePartPath(fromPath, toPath) {
     const up = fromDir.length - common;
     return [...Array(up).fill('..'), ...toSegments.slice(common)].join('/');
 }
+export function resolveRelativePart(basePart, target) {
+    if (target.startsWith('/'))
+        return target.slice(1);
+    const baseDir = basePart.slice(0, basePart.lastIndexOf('/') + 1);
+    const out = [];
+    for (const segment of `${baseDir}${target}`.split('/')) {
+        if (segment === '' || segment === '.')
+            continue;
+        if (segment === '..')
+            out.pop();
+        else
+            out.push(segment);
+    }
+    return out.join('/');
+}

package/dist/io/opc/read-opc.d.ts

@@ -6,12 +6,31 @@ export interface PackageAccessors {
     /** A part's raw bytes, or undefined when the package holds no such part. */
     partBytes: (path: string) => Uint8Array | undefined;
 }
+/** A spreadsheet package opened for reading: inflated under the read bound, its parts bound to
+ * accessors, and its XML office document read if it has one. */
+export interface OpenedSpreadsheet {
+    /** The inflated parts, for a reader that hands the whole package on to another codec. */
+    readonly files: Record<string, Uint8Array>;
+    readonly pkg: PackageAccessors;
+    /** `xl/workbook.xml`, or undefined when the package carries no XML office document (a `.xlsb`
+     * carries `xl/workbook.bin` instead). Each entry point answers that case for itself: they
+     * genuinely want different answers, and the difference is documented where they diverge. */
+    readonly workbookXml: string | undefined;
+}
+/**
+ * Open a spreadsheet package: the six-step preamble every reader shares, and in particular the two
+ * decisions worth having exactly one of. The inflate bound is a security decision (an unbounded
+ * inflate is a zip bomb) and "does this package carry an XML office document" is the dispatch
+ * decision between the two codecs, so neither should be restated once per entry point.
+ *
+ * It deliberately stops short of the shared strings and the style table: those are codec-specific
+ * (`xl/sharedStrings.xml` against BIFF12's own record stream), and lifting them here would put
+ * SpreadsheetML knowledge into the container layer.
+ */
+export declare function openSpreadsheetPackage(data: Uint8Array, maxUncompressedBytes: number | undefined): OpenedSpreadsheet;
 export declare function packageAccessors(files: Record<string, Uint8Array>): PackageAccessors;
 export declare function relationshipTargetByType(xml: string, suffix: string): string | undefined;
 export declare function relationshipTargetsByType(xml: string, suffix: string): string[];
-export declare function resolveRelativePart(basePart: string, target: string): string;
-export declare function resolveWorkbookPart(target: string): string;
-export declare function parseRelationships(xml: string): Map<string, string>;
 export interface RelationshipRecord {
     readonly id: string;
     readonly type: string;

package/dist/io/opc/read-opc.js

@@ -1,6 +1,13 @@
 import { strFromU8 } from 'fflate';
 import { openElements } from '../../xml/xml-read.js';
-import { extensionOf, relsPathFor } from './part-paths.js';
+import { extensionOf, relsPathFor, resolveRelativePart } from './part-paths.js';
+import { DEFAULT_MAX_UNCOMPRESSED } from './read-options.js';
+import { inflateSpreadsheetPackage } from './sniff-format.js';
+export function openSpreadsheetPackage(data, maxUncompressedBytes) {
+    const files = inflateSpreadsheetPackage(data, maxUncompressedBytes ?? DEFAULT_MAX_UNCOMPRESSED);
+    const pkg = packageAccessors(files);
+    return { files, pkg, workbookXml: pkg.partText('xl/workbook.xml') };
+}
 export function packageAccessors(files) {
     return {
         partText: (path) => {
@@ -10,48 +17,13 @@ export function packageAccessors(files) {
         partBytes: (path) => files[path],
     };
 }
-function matchesType(attrs, suffix) {
-    return (attrs.Type !== undefined && attrs.Target !== undefined && attrs.Type.endsWith(`/${suffix}`));
-}
 export function relationshipTargetByType(xml, suffix) {
     return relationshipTargetsByType(xml, suffix)[0];
 }
 export function relationshipTargetsByType(xml, suffix) {
-    const targets = [];
-    for (const { attrs } of openElements(xml, 'Relationship')) {
-        if (matchesType(attrs, suffix))
-            targets.push(attrs.Target);
-    }
-    return targets;
-}
-export function resolveRelativePart(basePart, target) {
-    if (target.startsWith('/'))
-        return target.slice(1);
-    const baseDir = basePart.slice(0, basePart.lastIndexOf('/') + 1);
-    const out = [];
-    for (const segment of `${baseDir}${target}`.split('/')) {
-        if (segment === '' || segment === '.')
-            continue;
-        if (segment === '..')
-            out.pop();
-        else
-            out.push(segment);
-    }
-    return out.join('/');
-}
-export function resolveWorkbookPart(target) {
-    if (target.startsWith('/'))
-        return target.slice(1);
-    return `xl/${target.replace(/^\.\//, '')}`;
-}
-export function parseRelationships(xml) {
-    const rels = new Map();
-    for (const { attrs } of openElements(xml, 'Relationship')) {
-        if (attrs.Id !== undefined && attrs.Target !== undefined) {
-            rels.set(attrs.Id, attrs.Target);
-        }
-    }
-    return rels;
+    return parseRelationshipRecords(xml)
+        .filter((record) => record.type.endsWith(`/${suffix}`))
+        .map((record) => record.target);
 }
 export function parseRelationshipRecords(xml) {
     const records = [];

package/dist/io/opc/rels.d.ts

@@ -1,15 +1,21 @@
+/**
+ * A single `<Relationship>`. An `external` target lives outside the package (a hyperlink URL), so the
+ * element carries `TargetMode="External"`; a package-internal target (the default) omits it.
+ *
+ * All three values are escaped here, unconditionally. The obligation used to sit in a comment saying
+ * the caller escaped a target it did not control, which made the safety of this function a property
+ * of its call sites rather than of itself, on the one boundary in the tree where `xml.ts` says that is
+ * explicitly not how it is done. Escaping a writer-controlled package path is the identity, so the
+ * generated chains emit the same bytes and the guarantee holds by construction instead of by
+ * inspecting every caller. `TargetMode` stays a fixed token, not a value.
+ */
 export declare function relationship(id: string, type: string, target: string, options?: {
     external?: boolean;
 }): string;
 export declare function relationshipsPart(relationships: readonly string[]): string;
-export declare function preservedRelsXml(rels: readonly {
-    id: string;
-    type: string;
-    target: string;
-    external?: boolean;
-}[]): string;
 export declare function relsPartXml(rels: readonly {
     id: string;
     type: string;
     target: string;
+    external?: boolean;
 }[]): string;

package/dist/io/opc/rels.js

@@ -2,14 +2,12 @@ import { escapeAttr, XML_DECLARATION } from '../../xml/xml.js';
 import { PKG_RELS_NS } from './namespaces.js';
 export function relationship(id, type, target, options) {
     const mode = options?.external ? ' TargetMode="External"' : '';
-    return `<Relationship Id="${id}" Type="${type}" Target="${target}"${mode}/>`;
+    return (`<Relationship Id="${escapeAttr(id)}" Type="${escapeAttr(type)}" ` +
+        `Target="${escapeAttr(target)}"${mode}/>`);
 }
 export function relationshipsPart(relationships) {
     return `${XML_DECLARATION}<Relationships xmlns="${PKG_RELS_NS}">${relationships.join('')}</Relationships>`;
 }
-export function preservedRelsXml(rels) {
-    return relationshipsPart(rels.map((rel) => relationship(rel.id, rel.type, escapeAttr(rel.target), rel.external ? { external: true } : {})));
-}
 export function relsPartXml(rels) {
-    return relationshipsPart(rels.map((rel) => relationship(rel.id, rel.type, rel.target)));
+    return relationshipsPart(rels.map((rel) => relationship(rel.id, rel.type, rel.target, rel.external ? { external: true } : {})));
 }

package/dist/io/style/xf-style.d.ts

@@ -1,15 +1,20 @@
 import { type Cell } from '../../core/cell.ts';
-import { type Border, type CellStyle, type Fill, type Font, type NamedCellStyle } from '../../core/style.ts';
+import { type Border, type CellStyle, type Fill, type Font, type NamedCellStyle, type TableStyleTable } from '../../core/style.ts';
 /**
  * What an xf resolves to: the {@link CellStyle} facet tuple, plus the two flags an xf carries that
  * are not facets. Absent facets stay undefined, matching the contract that an unset facet is simply
  * not present on the reconstructed cell.
  *
  * It *derives* the facets rather than listing them, so a seventh facet added to `CellStyle` reaches
- * both readers the moment it joins. Re-declaring them here, the shape this replaced, meant a new
+ * every codec the moment it joins. Re-declaring them here, the shape this replaced, meant a new
  * facet silently stopped at the model and never appeared in a file we read back.
+ *
+ * Read-only throughout: an xf is a resolved snapshot, assembled once and then only consulted. Both
+ * readers already build theirs through an explicitly-mutable draft (`{-readonly [K in keyof
+ * XfStyle]?: …}`), so the constraint costs nothing and stops a consumer editing a table entry that
+ * other cells share.
  */
-export interface XfStyle extends CellStyle {
+export interface XfStyle extends Readonly<CellStyle> {
     readonly quotePrefix?: boolean;
     /** The `xfId` link into the named-style layer (`cellStyleXfs`); absent for the Normal default (0). */
     readonly xfId?: number;
@@ -28,7 +33,31 @@ export interface StyleTable {
      * file declares no font table.
      */
     readonly defaultFont?: Font;
+    /**
+     * The stylesheet's preserved sub-tables, captured verbatim in the same scan that read the xfs: the
+     * differential styles a conditional format's `dxfId` indexes, a custom indexed palette, the
+     * author's recent-colour swatches, and the custom table-style definitions.
+     *
+     * They ride here rather than being extracted separately because they come out of the same part,
+     * and the reader that wanted them four more times over that part is what this replaced. Each is
+     * raw source text: re-parsing and re-serialising is exactly what would cost a foreign `<dxf>` its
+     * number format on a round trip.
+     */
+    readonly preserved: PreservedStyleTables;
+}
+/** The stylesheet content the model does not interpret and re-emits byte for byte. */
+export interface PreservedStyleTables {
+    readonly dxfs: readonly string[];
+    readonly indexedColors: readonly string[];
+    readonly mruColors: readonly string[];
+    readonly tableStyles: TableStyleTable;
 }
+/** The preserved sub-tables of a stylesheet that carries none: a package with no `styles.xml`, and
+ * the BIFF12 stylesheet, whose binary records hold no verbatim XML there would be anything to keep. */
+export declare const NO_PRESERVED_STYLE_TABLES: PreservedStyleTables;
+/** The xf layer of a stylesheet: what {@link resolveStyleTable} assembles out of the format tables,
+ * before the verbatim sub-tables that ride alongside it in a {@link StyleTable}. */
+export type ResolvedXfTables = Omit<StyleTable, 'preserved'>;
 /**
  * The format code a number-format id denotes: the file's own `<numFmt>`/`BrtFmt` declaration if it
  * has one, else the built-in Excel defines for that id. Id 0 is General, the absence of a format,
@@ -76,4 +105,4 @@ export declare function resolveStyleTable(tables: {
     readonly namedXfs: ReadonlyArray<XfStyle>;
     readonly labels: ReadonlyArray<StyleLabel>;
     readonly fonts: ReadonlyArray<Font | undefined>;
-}): StyleTable;
+}): ResolvedXfTables;

package/dist/io/style/xf-style.js

@@ -1,6 +1,12 @@
 import { applyCellStyle } from '../../core/cell.js';
 import { NAMED_STYLE_ID } from '../../core/internal.js';
 import { assignStyleFacets, } from '../../core/style.js';
+export const NO_PRESERVED_STYLE_TABLES = {
+    dxfs: [],
+    indexedColors: [],
+    mruColors: [],
+    tableStyles: { styles: [] },
+};
 const BUILTIN_NUMFMTS = new Map([
     [1, '0'],
     [2, '0.00'],
@@ -71,8 +77,13 @@ export function resolveStyleTable(tables) {
         const named = namedXfs[xf.xfId];
         return named === undefined ? xf : { ...named, ...xf };
     });
+    const labelsByXfId = new Map();
+    for (const label of labels) {
+        if (!labelsByXfId.has(label.xfId))
+            labelsByXfId.set(label.xfId, label);
+    }
     const namedStyles = namedXfs.map((xf, index) => {
-        const label = labels.find((entry) => entry.xfId === index);
+        const label = labelsByXfId.get(index);
         const style = {};
         assignStyleFacets(style, xf);
         if (label?.name !== undefined)

package/dist/io/xlsb/read-styles.js

@@ -1,4 +1,4 @@
-import { numFmtCodeFor, resolveStyleTable, } from '../style/xf-style.js';
+import { numFmtCodeFor, NO_PRESERVED_STYLE_TABLES, resolveStyleTable, } from '../style/xf-style.js';
 import { RecordReader } from './primitives.js';
 import { readRecords } from './record-stream.js';
 import { BRT } from './record-types.js';
@@ -22,7 +22,7 @@ const COLLECTION_ENDS = new Set([
 ]);
 export function parseStyleTable(part) {
     if (part === undefined)
-        return { cellXfs: [], namedStyles: [] };
+        return { cellXfs: [], namedStyles: [], preserved: NO_PRESERVED_STYLE_TABLES };
     const numFmtCodes = new Map();
     const fonts = [];
     const fills = [];
@@ -73,7 +73,10 @@ export function parseStyleTable(part) {
                 break;
         }
     }
-    return resolveStyleTable({ directXfs, namedXfs, labels, fonts });
+    return {
+        ...resolveStyleTable({ directXfs, namedXfs, labels, fonts }),
+        preserved: NO_PRESERVED_STYLE_TABLES,
+    };
 }
 function readXf(reader, deps, isDirect) {
     const parent = reader.u16();

package/dist/io/xlsb/read.d.ts

@@ -1,5 +1,5 @@
 import { Workbook } from '../../core/workbook.ts';
-import { type ReadXlsxOptions } from '../opc/read-options.ts';
+import type { ReadXlsxOptions } from '../opc/read-options.ts';
 /** The office-document part every `.xlsb` package is entered through. */
 export declare const XLSB_WORKBOOK_PART = "xl/workbook.bin";
 /**

package/dist/io/xlsb/read.js

@@ -2,9 +2,7 @@ import { unmangleFunctions } from '../../core/formula.js';
 import { INTERNAL } from '../../core/internal.js';
 import { Workbook } from '../../core/workbook.js';
 import { UnsupportedFormatError } from '../opc/errors.js';
-import { packageAccessors, parseRelationships, resolveWorkbookPart } from '../opc/read-opc.js';
-import { DEFAULT_MAX_UNCOMPRESSED } from '../opc/read-options.js';
-import { inflateSpreadsheetPackage } from '../opc/sniff-format.js';
+import { openSpreadsheetPackage, packageAccessors, readPartRelationships } from '../opc/read-opc.js';
 import { decodeFormula } from './formula.js';
 import { RecordReader } from './primitives.js';
 import { parseSharedStrings } from './read-shared-strings.js';
@@ -14,8 +12,7 @@ import { readRecords } from './record-stream.js';
 import { BRT } from './record-types.js';
 export const XLSB_WORKBOOK_PART = 'xl/workbook.bin';
 export function readXlsb(data, options = {}) {
-    const cap = options.maxUncompressedBytes ?? DEFAULT_MAX_UNCOMPRESSED;
-    return readXlsbPackage(inflateSpreadsheetPackage(data, cap));
+    return readXlsbPackage(openSpreadsheetPackage(data, options.maxUncompressedBytes).files);
 }
 export function readXlsbPackage(files) {
     const { partText, partBytes } = packageAccessors(files);
@@ -23,7 +20,7 @@ export function readXlsbPackage(files) {
     if (workbookPart === undefined) {
         throw new UnsupportedFormatError('unknown', `not a valid .xlsb package: ${XLSB_WORKBOOK_PART} is missing`);
     }
-    const rels = parseRelationships(partText('xl/_rels/workbook.bin.rels') ?? '');
+    const rels = readPartRelationships(XLSB_WORKBOOK_PART, partText);
     const sharedStrings = parseSharedStrings(partBytes('xl/sharedStrings.bin'));
     const { cellXfs, namedStyles, defaultFont } = parseStyleTable(partBytes('xl/styles.bin'));
     const workbook = new Workbook();
@@ -39,8 +36,8 @@ export function readXlsbPackage(files) {
     };
     for (const declared of declaration.sheets) {
         const sheet = workbook.addWorksheet(declared.name, { state: declared.state });
-        const target = declared.relId === undefined ? undefined : rels.get(declared.relId);
-        const part = target === undefined ? undefined : partBytes(resolveWorkbookPart(target));
+        const target = declared.relId === undefined ? undefined : rels.byId(declared.relId)?.target;
+        const part = target === undefined ? undefined : partBytes(rels.pathOf(target));
         if (part !== undefined)
             parseWorksheet(part, sheet, sharedStrings, cellXfs, scope);
     }

package/dist/io/xlsx/cell-accumulator.d.ts

@@ -1,9 +1,8 @@
 import type { CellValue } from '../../core/value.ts';
 import type { Worksheet } from '../../core/worksheet.ts';
-import { type XmlAttributes } from '../../xml/xml-read.ts';
+import { type XmlAttributes } from '../../xml/xml-scan.ts';
 import { type XfStyle } from '../style/xf-style.ts';
 import { type SharedString } from './cell-value.ts';
-import { RunAccumulator } from './rich-runs.ts';
 export declare class CellAccumulator {
     #private;
     constructor(options: {
@@ -15,8 +14,6 @@ export declare class CellAccumulator {
     get styleIndex(): number;
     /** This cell's 1-based column, or -1 when its address was absent or unparseable. */
     get col(): number;
-    /** The rich-text run accumulator, driven by the surrounding parser's `<r>`/`<rPr>` handling. */
-    get runs(): RunAccumulator;
     /**
      * The text gathered since the current element opened. A caller reads it for the elements it
      * captures itself (see {@link capture}); the machine reads it for its own.
@@ -40,5 +37,6 @@ export declare class CellAccumulator {
      */
     closeElement(local: string): 'cell' | 'claimed' | 'other';
     finalize(sheet: Worksheet, sharedStrings: readonly SharedString[], style: XfStyle | undefined): void;
+    private cachedResult;
     decode(sharedStrings: readonly SharedString[], style: XfStyle | undefined): CellValue;
 }

package/dist/io/xlsx/cell-accumulator.js

@@ -1,6 +1,6 @@
-import { decodeAddress, encodeAddress } from '../../core/address.js';
+import { encodeAddress, tryDecodeCellRef } from '../../core/address.js';
 import { translateFormula, unmangleFunctions } from '../../core/formula.js';
-import { boolStrict, decodeSpreadsheetText, numInteger, } from '../../xml/xml-read.js';
+import { boolStrict, numInteger } from '../../xml/xml-scan.js';
 import { applyXfToCell } from '../style/xf-style.js';
 import { decodeCellContent, decodeFormulaResult, } from './cell-value.js';
 import { RunAccumulator } from './rich-runs.js';
@@ -16,17 +16,14 @@ export class CellAccumulator {
     #sharedClone = false;
     #dataTable = null;
     #valueText = '';
-    #inlineText = '';
     #hasFormula = false;
     #hasValue = false;
-    #runs = new RunAccumulator();
+    #runs;
     #masters = new Map();
-    #inInlineString = false;
     #capture = false;
     #text = '';
-    #richRuns;
     constructor(options) {
-        this.#richRuns = options.richRuns;
+        this.#runs = new RunAccumulator({ container: 'is', readRuns: options.richRuns });
     }
     get ref() {
         return this.#ref;
@@ -37,19 +34,15 @@ export class CellAccumulator {
     get col() {
         return this.#col;
     }
-    get runs() {
-        return this.#runs;
-    }
     #beginCell(attrs) {
-        this.#ref = attrs.r ?? '';
         this.#type = attrs.t ?? '';
         this.#style = numInteger(attrs.s, 0) ?? -1;
-        const decoded = this.#ref === '' ? undefined : decodeAddress(this.#ref);
+        const decoded = tryDecodeCellRef(attrs.r ?? '');
+        this.#ref = decoded === undefined ? '' : (attrs.r ?? '');
         this.#col = decoded?.col ?? -1;
         this.#row = decoded?.row ?? -1;
         this.#formula = '';
         this.#valueText = '';
-        this.#inlineText = '';
         this.#runs.beginContainer();
         this.#hasFormula = false;
         this.#hasValue = false;
@@ -81,15 +74,6 @@ export class CellAccumulator {
         this.#valueText = text;
         this.#hasValue = true;
     }
-    #beginInlineString() {
-        this.#inlineText = '';
-        this.#runs.beginContainer();
-    }
-    #appendText(text) {
-        const decoded = decodeSpreadsheetText(text);
-        if (!this.#runs.appendText(decoded) && this.#inInlineString)
-            this.#inlineText += decoded;
-    }
     get capturedText() {
         return this.#text;
     }
@@ -99,14 +83,12 @@ export class CellAccumulator {
     openElement(local, attrs, selfClosing) {
         this.#text = '';
         this.#capture = false;
+        if (this.#runs.open(local, attrs, selfClosing))
+            return true;
         switch (local) {
             case 'c':
                 this.#beginCell(attrs);
                 return true;
-            case 'is':
-                this.#inInlineString = true;
-                this.#beginInlineString();
-                return true;
             case 'f':
                 this.#capture = !selfClosing;
                 this.#beginFormula(attrs, selfClosing);
@@ -114,25 +96,12 @@ export class CellAccumulator {
             case 'v':
                 this.#capture = !selfClosing;
                 return true;
-            case 't':
-                this.#capture = true;
-                return true;
-            case 'r':
-                if (!this.#richRuns)
-                    return false;
-                if (this.#inInlineString)
-                    this.#runs.beginRun();
-                return true;
-            case 'rPr':
-                if (!this.#richRuns)
-                    return false;
-                this.#runs.beginProperties();
-                return true;
             default:
                 return false;
         }
     }
     appendChunk(chunk) {
+        this.#runs.text(chunk);
         if (this.#capture)
             this.#text += chunk;
     }
@@ -142,6 +111,8 @@ export class CellAccumulator {
         return verdict;
     }
     #closeElement(local) {
+        if (this.#runs.close(local) !== 'other')
+            return 'claimed';
         switch (local) {
             case 'f':
                 this.#setFormula(this.#text);
@@ -149,17 +120,6 @@ export class CellAccumulator {
             case 'v':
                 this.#setValue(this.#text);
                 return 'claimed';
-            case 't':
-                this.#appendText(this.#text);
-                return 'claimed';
-            case 'r':
-                if (!this.#richRuns)
-                    return 'other';
-                this.#runs.endRun();
-                return 'claimed';
-            case 'is':
-                this.#inInlineString = false;
-                return 'claimed';
             case 'c':
                 return 'cell';
             default:
@@ -183,9 +143,7 @@ export class CellAccumulator {
                 ...(boolStrict(this.#dataTable.dtr) ? { dataTableRow: true } : {}),
                 ...(this.#dataTable.r1 !== undefined ? { r1: this.#dataTable.r1 } : {}),
                 ...(this.#dataTable.r2 !== undefined ? { r2: this.#dataTable.r2 } : {}),
-                ...(this.#hasValue
-                    ? { result: decodeFormulaResult(this.#type, this.#valueText, style?.numFmt) }
-                    : {}),
+                ...this.cachedResult(style),
             };
         }
         if (this.#hasFormula && this.#formulaShared && this.#formulaSi >= 0) {
@@ -198,14 +156,18 @@ export class CellAccumulator {
                 return {
                     sharedFormula: encodeAddress(master.col, master.row),
                     formula: unmangleFunctions(translated),
-                    ...(this.#hasValue
-                        ? { result: decodeFormulaResult(this.#type, this.#valueText, style?.numFmt) }
-                        : {}),
+                    ...this.cachedResult(style),
                 };
             }
         }
         return this.decode(sharedStrings, style);
     }
+    cachedResult(style) {
+        if (!this.#hasValue)
+            return {};
+        const result = decodeFormulaResult(this.#type, this.#valueText, style?.numFmt);
+        return result === undefined ? {} : { result };
+    }
     decode(sharedStrings, style) {
         const raw = {
             type: this.#type,
@@ -213,7 +175,7 @@ export class CellAccumulator {
             formula: this.#formula,
             hasValue: this.#hasValue,
             valueText: this.#valueText,
-            inlineText: this.#inlineText,
+            inlineText: this.#runs.plainText,
             richTextRuns: this.#runs.runs,
         };
         return decodeCellContent(raw, sharedStrings, style?.numFmt);

package/dist/io/xlsx/cell-value.d.ts

@@ -29,4 +29,4 @@ export declare function decodeCellContent(raw: RawCell, sharedStrings: readonly
  * `numFmt` to a {@link Date} exactly as a bare numeric cell is, so a date-valued formula result
  * (e.g. `TODAY()`) reads back as a Date, not a serial. Shared by the buffered reader's shared-formula
  * clone resolution, which caches a result the same way a plain formula cell does. */
-export declare function decodeFormulaResult(type: string, valueText: string, numFmt?: string): FormulaResult;
+export declare function decodeFormulaResult(type: string, valueText: string, numFmt?: string): FormulaResult | undefined;

package/dist/io/xlsx/cell-value.js

@@ -1,7 +1,7 @@
 import { isDateFormat, serialToDate } from '../../core/date.js';
 import { unmangleFunctions } from '../../core/formula.js';
 import { isErrorCode, } from '../../core/value.js';
-import { boolStrict, decodeSpreadsheetText } from '../../xml/xml-read.js';
+import { boolStrict, decodeSpreadsheetText, numFinite } from '../../xml/xml-scan.js';
 export function decodeCellContent(raw, sharedStrings, numFmt) {
     if (raw.hasFormula) {
         const stored = unmangleFunctions(raw.formula);
@@ -32,8 +32,11 @@ function decodeValue(type, valueText, inlineText, hasValue, sharedStrings) {
             return boolStrict(valueText);
         case 'e':
             return isErrorCode(valueText) ? { error: valueText } : valueText;
-        default:
-            return hasValue ? Number(valueText) : null;
+        default: {
+            if (!hasValue)
+                return null;
+            return numFinite(valueText) ?? null;
+        }
     }
 }
 export function decodeFormulaResult(type, valueText, numFmt) {
@@ -51,6 +54,6 @@ function decodeResult(type, valueText) {
         case 'e':
             return isErrorCode(valueText) ? { error: valueText } : valueText;
         default:
-            return Number(valueText);
+            return numFinite(valueText);
     }
 }

package/dist/io/xlsx/color-xml.d.ts

@@ -1,4 +1,4 @@
-import type { Color } from '../../core/style.ts';
+import { type Color } from '../../core/style.ts';
 /** Serialise a {@link Color} as the attribute list a `<color>`-shaped element carries. */
 export declare function colorAttrs(color: Color): string;
 export declare function parseColor(attrs: {

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

@@ -1,8 +1,9 @@
-import { numFinite, numInteger } from '../../xml/xml-read.js';
+import { parseArgb } from '../../core/style.js';
+import { numFinite, numInteger } from '../../xml/xml-scan.js';
+import { numberText } from '../../xml/xml.js';
 function normalizeArgb(argb) {
-    const hex = argb.startsWith('#') ? argb.slice(1) : argb;
-    const rgb = hex.length === 6 ? `FF${hex}` : hex;
-    if (!/^[0-9a-fA-F]{8}$/.test(rgb)) {
+    const rgb = parseArgb(argb);
+    if (rgb === undefined) {
         throw new SyntaxError(`Invalid ARGB colour ${JSON.stringify(argb)}: expected 6 or 8 hexadecimal digits`);
     }
     return rgb;
@@ -12,11 +13,11 @@ export function colorAttrs(color) {
     if (color.argb !== undefined)
         parts.push(`rgb="${normalizeArgb(color.argb)}"`);
     if (color.theme !== undefined)
-        parts.push(`theme="${color.theme}"`);
+        parts.push(`theme="${numberText(color.theme)}"`);
     if (color.tint !== undefined)
-        parts.push(`tint="${color.tint}"`);
+        parts.push(`tint="${numberText(color.tint)}"`);
     if (color.indexed !== undefined)
-        parts.push(`indexed="${color.indexed}"`);
+        parts.push(`indexed="${numberText(color.indexed)}"`);
     return parts.join(' ');
 }
 export function parseColor(attrs) {

package/dist/io/xlsx/comments.js

@@ -1,6 +1,7 @@
 import { tryDecodeCellRef } from '../../core/address.js';
-import { decodeSpreadsheetText, localName, numInteger, parseXml } from '../../xml/xml-read.js';
-import { escapeAttr, escapeText, textElement, XML_DECLARATION } from '../../xml/xml.js';
+import { parseXml } from '../../xml/xml-read.js';
+import { decodeSpreadsheetText, localName, numInteger } from '../../xml/xml-scan.js';
+import { escapeText, textAttr, textElement, XML_DECLARATION } from '../../xml/xml.js';
 import { MARKUP_COMPATIBILITY_NS, REVISION_NS, SPREADSHEETML_NS } from './namespaces.js';
 export function collectComments(sheet, threads) {
     const fallbacks = threadFallbacks(threads);
@@ -56,7 +57,7 @@ export function commentsXml(comments) {
         .map((comment) => {
         const { threadId } = comment;
         const authorId = threadId === undefined ? noteAuthorId : authorIdByThreadId.get(threadId);
-        const uid = threadId === undefined ? '' : ` xr:uid="${escapeAttr(threadId)}"`;
+        const uid = textAttr('xr:uid', threadId);
         return (`<comment ref="${comment.ref}" authorId="${authorId}"${uid}>` +
             `<text><r>${textElement(comment.text)}</r></text>` +
             '</comment>');
@@ -161,6 +162,8 @@ export function applyNotes(sheet, comments) {
     for (const [ref, comment] of comments) {
         if (comment.threadId !== undefined && headIds.has(comment.threadId))
             continue;
+        if (tryDecodeCellRef(ref) === undefined)
+            continue;
         sheet.getCell(ref).note = comment.text;
     }
 }