@shbernal/ts-xlsx 2.0.0 → 3.0.0

package/dist/io/xlsx/hyperlinks.js

@@ -1,7 +1,8 @@
-import { decodeRange } from '../../core/address.js';
+import { tryDecodeRange } from '../../core/address.js';
 import { isHyperlinkValue, isRichTextValue } from '../../core/value.js';
-import { localName, parseXml } from '../../xml/xml-read.js';
-import { escapeAttr } from '../../xml/xml.js';
+import {} from '../../xml/xml-read.js';
+import { localName } from '../../xml/xml-scan.js';
+import { escapeAttr, textAttr } from '../../xml/xml.js';
 export function collectHyperlinks(sheet) {
     const links = [];
     for (const { cells } of sheet.rows()) {
@@ -33,39 +34,41 @@ export function hyperlinksXml(links) {
     const items = links
         .map((link) => {
         const rid = link.relId !== undefined ? ` r:id="${link.relId}"` : '';
-        const location = link.location !== undefined ? ` location="${escapeAttr(link.location)}"` : '';
-        const tooltip = link.tooltip !== undefined ? ` tooltip="${escapeAttr(link.tooltip)}"` : '';
+        const location = textAttr('location', link.location);
+        const tooltip = textAttr('tooltip', link.tooltip);
         return `<hyperlink ref="${escapeAttr(link.ref)}"${rid}${location}${tooltip}/>`;
     })
         .join('');
     return `<hyperlinks>${items}</hyperlinks>`;
 }
-export function parseSheetHyperlinks(xml) {
+export function sheetHyperlinkPass() {
     const links = [];
-    parseXml(xml, {
-        onOpen(name, attrs) {
-            if (localName(name) !== 'hyperlink')
-                return;
-            const ref = attrs.ref;
-            if (ref === undefined)
-                return;
-            links.push({
-                ref,
-                ...(attrs['r:id'] !== undefined ? { rid: attrs['r:id'] } : {}),
-                ...(attrs.location !== undefined ? { location: attrs.location } : {}),
-                ...(attrs.tooltip !== undefined ? { tooltip: attrs.tooltip } : {}),
-            });
+    return {
+        handlers: {
+            onOpen(name, attrs) {
+                if (localName(name) !== 'hyperlink')
+                    return;
+                const ref = attrs.ref;
+                if (ref === undefined)
+                    return;
+                links.push({
+                    ref,
+                    ...(attrs['r:id'] !== undefined ? { rid: attrs['r:id'] } : {}),
+                    ...(attrs.location !== undefined ? { location: attrs.location } : {}),
+                    ...(attrs.tooltip !== undefined ? { tooltip: attrs.tooltip } : {}),
+                });
+            },
         },
-    });
-    return links;
+        result: () => links,
+    };
 }
 export function applyHyperlinks(sheet, links, targetOf) {
     for (const link of links) {
         const target = resolveTarget(link, targetOf);
         if (target === undefined)
             continue;
-        const decoded = decodeRefSafe(link.ref);
-        if (decoded === undefined)
+        const decoded = tryDecodeRange(link.ref);
+        if (decoded === undefined || decoded.tl.col === undefined || decoded.tl.row === undefined)
             continue;
         const cell = sheet.getCell(decoded.tl.address);
         const cellValue = cell.value;
@@ -80,14 +83,6 @@ export function applyHyperlinks(sheet, links, targetOf) {
         cell.value = value;
     }
 }
-function decodeRefSafe(ref) {
-    try {
-        return decodeRange(ref);
-    }
-    catch {
-        return undefined;
-    }
-}
 function resolveTarget(link, targetOf) {
     if (link.rid !== undefined) {
         const base = targetOf(link.rid);

package/dist/io/xlsx/images.js

@@ -1,25 +1,26 @@
-import { isOneCellAnchor, } from '../../core/image.js';
-import { localName, numFinite, parseXml } from '../../xml/xml-read.js';
-import { XML_DECLARATION } from '../../xml/xml.js';
+import { isImageEditAs, isOneCellAnchor, } from '../../core/image.js';
+import { parseXml, TextCapture } from '../../xml/xml-read.js';
+import { enumToken, localName, numFinite } from '../../xml/xml-scan.js';
+import { checkedToken, numAttr, numberText, XML_DECLARATION } from '../../xml/xml.js';
 import { RELATIONSHIPS_NS } from '../opc/namespaces.js';
 import { relationship, relationshipsPart } from '../opc/rels.js';
 import { DRAWINGML_NS, XDR_NS } from './namespaces.js';
 const IMAGE_REL_TYPE = `${RELATIONSHIPS_NS}/image`;
-const IMAGE_CONTENT_TYPES = {
-    png: 'image/png',
-    jpg: 'image/jpeg',
-    jpeg: 'image/jpeg',
-    gif: 'image/gif',
-    bmp: 'image/bmp',
-    tif: 'image/tiff',
-    tiff: 'image/tiff',
-    emf: 'image/x-emf',
-    wmf: 'image/x-wmf',
-    svg: 'image/svg+xml',
-};
+const IMAGE_CONTENT_TYPES = new Map([
+    ['png', 'image/png'],
+    ['jpg', 'image/jpeg'],
+    ['jpeg', 'image/jpeg'],
+    ['gif', 'image/gif'],
+    ['bmp', 'image/bmp'],
+    ['tif', 'image/tiff'],
+    ['tiff', 'image/tiff'],
+    ['emf', 'image/x-emf'],
+    ['wmf', 'image/x-wmf'],
+    ['svg', 'image/svg+xml'],
+]);
 export function imageContentType(extension) {
     const ext = extension.toLowerCase();
-    return IMAGE_CONTENT_TYPES[ext] ?? `image/${ext}`;
+    return IMAGE_CONTENT_TYPES.get(ext) ?? `image/${ext}`;
 }
 export function drawingXml(images) {
     const anchors = images.map((image, i) => anchorXml(image, i + 1)).join('');
@@ -35,7 +36,7 @@ function anchorXml(image, id) {
         : twoCellAnchorXml(anchor.from, anchor.to, anchor.editAs ?? 'oneCell', anchor.rotation, image.embedId, id);
 }
 function twoCellAnchorXml(from, to, editAs, rotation, embedId, id) {
-    return (`<xdr:twoCellAnchor editAs="${editAs}">` +
+    return (`<xdr:twoCellAnchor editAs="${checkedToken(editAs, isImageEditAs, 'image anchor edit mode')}">` +
         `<xdr:from>${anchorPointXml(from)}</xdr:from>` +
         `<xdr:to>${anchorPointXml(to)}</xdr:to>` +
         picXml(embedId, id, rotation) +
@@ -45,13 +46,13 @@ function twoCellAnchorXml(from, to, editAs, rotation, embedId, id) {
 function oneCellAnchorXml(from, ext, rotation, embedId, id) {
     return ('<xdr:oneCellAnchor>' +
         `<xdr:from>${anchorPointXml(from)}</xdr:from>` +
-        `<xdr:ext cx="${ext.cx}" cy="${ext.cy}"/>` +
+        `<xdr:ext${numAttr('cx', ext.cx)}${numAttr('cy', ext.cy)}/>` +
         picXml(embedId, id, rotation) +
         '<xdr:clientData/>' +
         '</xdr:oneCellAnchor>');
 }
 function picXml(embedId, id, rotation) {
-    const xfrm = rotation !== undefined ? `<a:xfrm rot="${rotation}"/>` : '';
+    const xfrm = rotation !== undefined ? `<a:xfrm${numAttr('rot', rotation)}/>` : '';
     return ('<xdr:pic>' +
         `<xdr:nvPicPr><xdr:cNvPr id="${id}" name="Picture ${id}"/>` +
         '<xdr:cNvPicPr><a:picLocks noChangeAspect="1"/></xdr:cNvPicPr></xdr:nvPicPr>' +
@@ -61,8 +62,10 @@ function picXml(embedId, id, rotation) {
         '</xdr:pic>');
 }
 function anchorPointXml(point) {
-    return (`<xdr:col>${point.col}</xdr:col><xdr:colOff>${point.colOff ?? 0}</xdr:colOff>` +
-        `<xdr:row>${point.row}</xdr:row><xdr:rowOff>${point.rowOff ?? 0}</xdr:rowOff>`);
+    return (`<xdr:col>${numberText(point.col)}</xdr:col>` +
+        `<xdr:colOff>${numberText(point.colOff ?? 0)}</xdr:colOff>` +
+        `<xdr:row>${numberText(point.row)}</xdr:row>` +
+        `<xdr:rowOff>${numberText(point.rowOff ?? 0)}</xdr:rowOff>`);
 }
 export function drawingRelsXml(mediaTargets) {
     return relationshipsPart(mediaTargets.map((target, i) => relationship(`rId${i + 1}`, IMAGE_REL_TYPE, target)));
@@ -70,7 +73,6 @@ export function drawingRelsXml(mediaTargets) {
 function blankPoint() {
     return { col: 0, row: 0, colOff: 0, rowOff: 0 };
 }
-const EDIT_AS = new Set(['oneCell', 'twoCell', 'absolute']);
 export function parseDrawing(xml) {
     const anchors = [];
     let from = null;
@@ -81,10 +83,9 @@ export function parseDrawing(xml) {
     let embed;
     let target = null;
     let picDepth = 0;
-    let coord = '';
-    let text = '';
+    const coord = new TextCapture(COORDINATES);
     parseXml(xml, {
-        onOpen(name, attrs) {
+        onOpen(name, attrs, selfClosing) {
             const local = localName(name);
             if (local === 'twoCellAnchor' || local === 'oneCellAnchor') {
                 from = blankPoint();
@@ -92,8 +93,7 @@ export function parseDrawing(xml) {
                 ext = undefined;
                 rotation = undefined;
                 embed = undefined;
-                const mode = attrs.editAs;
-                editAs = mode !== undefined && EDIT_AS.has(mode) ? mode : undefined;
+                editAs = enumToken(attrs.editAs, isImageEditAs);
             }
             else if (local === 'pic') {
                 picDepth++;
@@ -120,22 +120,20 @@ export function parseDrawing(xml) {
                 if (value !== undefined)
                     embed = value;
             }
-            else if (target !== null && COORDINATES.has(local)) {
-                coord = local;
-                text = '';
+            else if (target !== null) {
+                coord.open(local, selfClosing);
             }
         },
         onText(chunk) {
-            if (coord !== '')
-                text += chunk;
+            coord.text(chunk);
         },
         onClose(name) {
             const local = localName(name);
-            if (target !== null && coord === local && COORDINATES.has(local)) {
+            const text = coord.close(local);
+            if (text !== undefined) {
                 const value = numFinite(text);
-                if (value !== undefined)
+                if (target !== null && value !== undefined)
                     setCoordinate(target, local, value);
-                coord = '';
             }
             else if (local === 'from' || local === 'to') {
                 target = null;

package/dist/io/xlsx/package-plan.d.ts

@@ -1,4 +1,5 @@
 import type { CommentThread } from '../../core/comment-thread.ts';
+import type { WorkbookImage } from '../../core/image.ts';
 import type { PivotTable } from '../../core/pivot-table.ts';
 import type { Table } from '../../core/table.ts';
 import type { Workbook } from '../../core/workbook.ts';
@@ -94,10 +95,17 @@ export interface MediaPart {
     readonly extension: string;
     readonly data: Uint8Array;
 }
+export interface ResolvedMedia {
+    readonly number: number;
+    readonly image: WorkbookImage;
+}
 export interface MediaPlan {
     readonly parts: readonly MediaPart[];
-    readonly numberById: ReadonlyMap<number, number>;
     readonly extensions: readonly string[];
+    /** The media part number and registered image for a referenced id. Total over the ids
+     * {@link planMedia} saw on the sheets it planned, because planning already threw on any it could
+     * not resolve; an id from anywhere else is a caller bug and is reported as one. */
+    resolve(id: number): ResolvedMedia;
 }
 export declare function planMedia(workbook: Workbook, sheets: readonly Worksheet[]): MediaPlan;
 export declare function planPreservedParts(workbook: Workbook, generatedDrawingCount: number, generatedMediaCount: number): PreservedPlan;

package/dist/io/xlsx/package-plan.js

@@ -1,6 +1,7 @@
 import { AuthoringError } from '../../errors.js';
 import { extensionOf, relativePartPath, relsPathFor, THEME_PART_PATH } from '../opc/part-paths.js';
-import { preservedRelsXml } from '../opc/rels.js';
+import { relsPartXml } from '../opc/rels.js';
+import { drawingPart, mediaPart, vmlDrawingPart } from './part-names.js';
 import { applyThemeOverrides } from './theme-xml.js';
 export class SheetRelIds {
     #next = 1;
@@ -9,34 +10,46 @@ export class SheetRelIds {
     }
 }
 export function planMedia(workbook, sheets) {
-    const usedIds = [];
+    const uses = [];
     const seen = new Set();
-    const use = (id) => {
+    const use = (id, sheetName, role) => {
         if (!seen.has(id)) {
             seen.add(id);
-            usedIds.push(id);
+            uses.push({ id, sheetName, role });
         }
     };
     for (const sheet of sheets) {
         for (const image of sheet.images)
-            use(image.imageId);
-        if (sheet.backgroundImageId !== undefined)
-            use(sheet.backgroundImageId);
+            use(image.imageId, sheet.name, 'anchor');
+        if (sheet.backgroundImageId !== undefined) {
+            use(sheet.backgroundImageId, sheet.name, 'background');
+        }
     }
     const parts = [];
-    const numberById = new Map();
+    const byId = new Map();
     const extensions = new Set();
-    usedIds.forEach((id, i) => {
+    uses.forEach(({ id, sheetName, role }, i) => {
         const image = workbook.getImage(id);
         if (image === undefined) {
-            throw new AuthoringError(`a worksheet anchors image id ${id}, which is not registered on the workbook`);
+            const reference = role === 'anchor' ? `anchors image id ${id}` : `sets background image id ${id}`;
+            throw new AuthoringError(`sheet "${sheetName}" ${reference}, which is not registered on the workbook`);
         }
         const number = i + 1;
         parts.push({ number, extension: image.extension, data: image.data });
-        numberById.set(id, number);
+        byId.set(id, { number, image });
         extensions.add(image.extension);
     });
-    return { parts, numberById, extensions: [...extensions] };
+    return {
+        parts,
+        extensions: [...extensions],
+        resolve(id) {
+            const resolved = byId.get(id);
+            if (resolved === undefined) {
+                throw new AuthoringError(`image id ${id} was not planned into this workbook's media`);
+            }
+            return resolved;
+        },
+    };
 }
 export function planPreservedParts(workbook, generatedDrawingCount, generatedMediaCount) {
     const sheets = workbook.worksheets;
@@ -84,7 +97,7 @@ export function planPreservedParts(workbook, generatedDrawingCount, generatedMed
                     : new TextEncoder().encode(applyThemeOverrides(new TextDecoder().decode(part.bytes), overrides)),
                 contentType: part.contentType,
                 relsPath: rels.length === 0 ? null : relsPathFor(newPath),
-                relsXml: rels.length === 0 ? null : preservedRelsXml(rels),
+                relsXml: rels.length === 0 ? null : relsPartXml(rels),
             });
         }
     }
@@ -114,11 +127,11 @@ export function planPreservedParts(workbook, generatedDrawingCount, generatedMed
 function preservedPartPath(originalPath, numbering) {
     const ext = extensionOf(originalPath);
     if (ext.toLowerCase() === 'vml')
-        return `xl/drawings/vmlDrawing${++numbering.vml}.vml`;
+        return vmlDrawingPart(++numbering.vml);
     if (originalPath.startsWith('xl/media/'))
-        return `xl/media/image${++numbering.media}.${ext}`;
+        return mediaPart(++numbering.media, ext);
     if (originalPath.startsWith('xl/drawings/') && ext.toLowerCase() === 'xml') {
-        return `xl/drawings/drawing${++numbering.drawing}.xml`;
+        return drawingPart(++numbering.drawing);
     }
     return originalPath;
 }

package/dist/io/xlsx/part-names.d.ts

@@ -0,0 +1,41 @@
+/** The office document part: the workbook every other part hangs off. */
+export declare const WORKBOOK_PART = "xl/workbook.xml";
+export declare const STYLES_PART = "xl/styles.xml";
+export declare const SHARED_STRINGS_PART = "xl/sharedStrings.xml";
+/** Singular and unnumbered, unlike the per-sheet thread parts: one identity registry serves the
+ * whole workbook's threaded comments. */
+export declare const PERSONS_PART = "xl/persons/person.xml";
+export declare const CORE_PROPS_PART = "docProps/core.xml";
+export declare const APP_PROPS_PART = "docProps/app.xml";
+/** `xl/worksheets/sheet{n}.xml`, numbered by the sheet's position in the workbook (1-based). */
+export declare function worksheetPart(number: number): string;
+/** `xl/tables/table{n}.xml`, numbered across the whole workbook rather than per sheet. */
+export declare function tablePart(number: number): string;
+/** `xl/media/image{n}.{ext}`: the one part name that carries the source file's own extension, since
+ * the `<Default>` content type is registered per extension. */
+export declare function mediaPart(number: number, extension: string): string;
+/** `xl/drawings/drawing{n}.xml`: the DrawingML anchors for one sheet's images. */
+export declare function drawingPart(number: number): string;
+/** `xl/drawings/vmlDrawing{n}.vml`: the legacy shape a note's box is drawn as. Numbered with the
+ * comments part it accompanies, not with the DrawingML drawings it shares a directory with. */
+export declare function vmlDrawingPart(number: number): string;
+/** `xl/comments{n}.xml`: directly under `xl/`, unlike every other numbered part. */
+export declare function commentsPart(number: number): string;
+/** `xl/threadedComments/threadedComment{n}.xml`: one sheet's modern conversations. */
+export declare function threadedCommentsPart(number: number): string;
+/** `xl/printerSettings/printerSettings{n}.bin`: an opaque blob carried through verbatim. */
+export declare function printerSettingsPart(number: number): string;
+/** `xl/pivotTables/pivotTable{n}.xml`: the pivot as its host sheet reaches it. */
+export declare function pivotTablePart(number: number): string;
+/** `xl/pivotCache/pivotCacheDefinition{n}.xml`: the field catalogue and source reference. */
+export declare function pivotCacheDefinitionPart(number: number): string;
+/** `xl/pivotCache/pivotCacheRecords{n}.xml`: the cached rows the definition points at. */
+export declare function pivotCacheRecordsPart(number: number): string;
+/**
+ * A part named as a Target of a relationship carried by a *worksheet*. Every worksheet part lives in
+ * `xl/worksheets/`, so one sheet's view of a target is every sheet's, and the sheet number the
+ * arithmetic runs against does not matter.
+ */
+export declare function targetFromWorksheet(partPath: string): string;
+/** A part named as a Target of a relationship carried by the workbook part. */
+export declare function targetFromWorkbook(partPath: string): string;

package/dist/io/xlsx/part-names.js

@@ -0,0 +1,46 @@
+import { relativePartPath } from '../opc/part-paths.js';
+export const WORKBOOK_PART = 'xl/workbook.xml';
+export const STYLES_PART = 'xl/styles.xml';
+export const SHARED_STRINGS_PART = 'xl/sharedStrings.xml';
+export const PERSONS_PART = 'xl/persons/person.xml';
+export const CORE_PROPS_PART = 'docProps/core.xml';
+export const APP_PROPS_PART = 'docProps/app.xml';
+export function worksheetPart(number) {
+    return `xl/worksheets/sheet${number}.xml`;
+}
+export function tablePart(number) {
+    return `xl/tables/table${number}.xml`;
+}
+export function mediaPart(number, extension) {
+    return `xl/media/image${number}.${extension}`;
+}
+export function drawingPart(number) {
+    return `xl/drawings/drawing${number}.xml`;
+}
+export function vmlDrawingPart(number) {
+    return `xl/drawings/vmlDrawing${number}.vml`;
+}
+export function commentsPart(number) {
+    return `xl/comments${number}.xml`;
+}
+export function threadedCommentsPart(number) {
+    return `xl/threadedComments/threadedComment${number}.xml`;
+}
+export function printerSettingsPart(number) {
+    return `xl/printerSettings/printerSettings${number}.bin`;
+}
+export function pivotTablePart(number) {
+    return `xl/pivotTables/pivotTable${number}.xml`;
+}
+export function pivotCacheDefinitionPart(number) {
+    return `xl/pivotCache/pivotCacheDefinition${number}.xml`;
+}
+export function pivotCacheRecordsPart(number) {
+    return `xl/pivotCache/pivotCacheRecords${number}.xml`;
+}
+export function targetFromWorksheet(partPath) {
+    return relativePartPath(worksheetPart(1), partPath);
+}
+export function targetFromWorkbook(partPath) {
+    return relativePartPath(WORKBOOK_PART, partPath);
+}

package/dist/io/xlsx/read-pivot.js

@@ -1,5 +1,6 @@
-import { pivotMetricFromSubtotal, } from '../../core/pivot-table.js';
-import { localName, numInteger, parseXml } from '../../xml/xml-read.js';
+import { isDeclarablePivotSourceKind, pivotMetricFromSubtotal, } from '../../core/pivot-table.js';
+import { parseXml } from '../../xml/xml-read.js';
+import { localName, numInteger } from '../../xml/xml-scan.js';
 export function parsePivotTable(tableXml, cacheXml) {
     const { fields, source } = parsePivotCacheDefinition(cacheXml);
     const def = parsePivotTableDefinition(tableXml);
@@ -85,16 +86,10 @@ function parsePivotTableDefinition(tableXml) {
     });
     return { name, cacheId, rowFields, columnFields, valueField, valueCaption, metric };
 }
-const SOURCE_KINDS = new Set([
-    'worksheet',
-    'external',
-    'consolidation',
-    'scenario',
-]);
 function sourceKind(type) {
     if (type === undefined)
         return 'worksheet';
-    return SOURCE_KINDS.has(type) ? type : 'unknown';
+    return isDeclarablePivotSourceKind(type) ? type : 'unknown';
 }
 function toIndex(value) {
     return numInteger(value, 0) ?? -1;

package/dist/io/xlsx/read-rows.js

@@ -1,12 +1,13 @@
 import { MAX_COLUMN, MAX_ROW } from '../../core/address.js';
 import { AuthoringError } from '../../errors.js';
-import { boolStrict, closeEmptyElements, localName, numInteger, xmlEvents, } from '../../xml/xml-read.js';
-import { packageAccessors } from '../opc/read-opc.js';
-import { inflateSpreadsheetPackage, unsupportedWorkbookPart } from '../opc/sniff-format.js';
+import { closeEmptyElements } from '../../xml/xml-read.js';
+import { boolStrict, localName, numInteger, xmlEvents } from '../../xml/xml-scan.js';
+import { openSpreadsheetPackage, readPartRelationships } from '../opc/read-opc.js';
+import { unsupportedWorkbookPart } from '../opc/sniff-format.js';
 import { CellAccumulator } from './cell-accumulator.js';
 import { XlsxParseError } from './errors.js';
 import { parseSharedStrings } from './read-shared-strings.js';
-import { DEFAULT_MAX_UNCOMPRESSED, parseRelationships, parseStyleTable, parseWorkbookSheets, resolveWorkbookPart, } from './read.js';
+import { parseStyleTable, parseWorkbookSheets, } from './read.js';
 export function* readSheetRows(data, options = {}) {
     const pkg = openPackage(data, options.maxUncompressedBytes);
     const chosen = pickSheet(pkg.sheets, options.sheet);
@@ -23,14 +24,13 @@ export function* readWorkbookStream(data, options = {}) {
     }
 }
 function openPackage(data, maxUncompressedBytes) {
-    const cap = maxUncompressedBytes ?? DEFAULT_MAX_UNCOMPRESSED;
-    const { partText: text } = packageAccessors(inflateSpreadsheetPackage(data, cap));
-    const workbookXml = text('xl/workbook.xml');
+    const { pkg, workbookXml } = openSpreadsheetPackage(data, maxUncompressedBytes);
+    const { partText: text } = pkg;
     if (workbookXml === undefined) {
         throw unsupportedWorkbookPart(text, 'the binary .xlsb format (BIFF12) cannot be row-streamed yet; read it with readXlsx or readXlsb');
     }
     const sheets = parseWorkbookSheets(workbookXml);
-    const rels = parseRelationships(text('xl/_rels/workbook.xml.rels') ?? '');
+    const rels = readPartRelationships('xl/workbook.xml', text);
     const sharedStrings = parseSharedStrings(text('xl/sharedStrings.xml') ?? '');
     const { cellXfs: xfStyles } = parseStyleTable(text('xl/styles.xml') ?? '');
     return {
@@ -38,9 +38,8 @@ function openPackage(data, maxUncompressedBytes) {
         sharedStrings,
         xfStyles,
         sheetXml(relId) {
-            const target = rels.get(relId);
-            const path = target === undefined ? undefined : resolveWorkbookPart(target);
-            return path === undefined ? undefined : text(path);
+            const target = rels.byId(relId)?.target;
+            return target === undefined ? undefined : text(rels.pathOf(target));
         },
     };
 }
@@ -88,7 +87,7 @@ class StreamedSheetReader {
     }
     get merges() {
         this.#ensureScanned();
-        return this.#merges;
+        return [...this.#merges];
     }
     #ensureScanned() {
         if (this.#scanned)
@@ -156,7 +155,7 @@ function* scanSheet(xml, sharedStrings, xfStyles, hiddenColumns, merges) {
     }
 }
 function collectHiddenColumn(attrs, hiddenColumns) {
-    if (attrs.hidden !== '1' && attrs.hidden !== 'true')
+    if (!boolStrict(attrs.hidden))
         return;
     const min = numInteger(attrs.min, 1);
     const max = numInteger(attrs.max, 1);

package/dist/io/xlsx/read-shared-strings.js

@@ -1,60 +1,22 @@
-import { decodeSpreadsheetText, localName, parseXml } from '../../xml/xml-read.js';
+import { parseXml } from '../../xml/xml-read.js';
+import { localName } from '../../xml/xml-scan.js';
 import { RunAccumulator } from './rich-runs.js';
 export function parseSharedStrings(xml) {
     if (xml === '')
         return [];
     const strings = [];
-    let plain = '';
-    const runs = new RunAccumulator();
-    let isRich = false;
-    let capture = false;
-    let text = '';
+    const runs = new RunAccumulator({ container: 'si', readRuns: true });
     parseXml(xml, {
-        onOpen(name, attrs) {
-            const local = localName(name);
-            switch (local) {
-                case 'si':
-                    plain = '';
-                    runs.beginContainer();
-                    isRich = false;
-                    break;
-                case 'r':
-                    isRich = true;
-                    runs.beginRun();
-                    break;
-                case 'rPr':
-                    runs.beginProperties();
-                    break;
-                case 't':
-                    capture = true;
-                    text = '';
-                    break;
-                default:
-                    runs.applyProperty(local, attrs);
-                    break;
-            }
+        onOpen(name, attrs, selfClosing) {
+            runs.open(localName(name), attrs, selfClosing);
         },
         onText(chunk) {
-            if (capture)
-                text += chunk;
+            runs.text(chunk);
         },
         onClose(name) {
-            const local = localName(name);
-            switch (local) {
-                case 't': {
-                    const decoded = decodeSpreadsheetText(text);
-                    if (!runs.appendText(decoded))
-                        plain += decoded;
-                    capture = false;
-                    break;
-                }
-                case 'r':
-                    runs.endRun();
-                    break;
-                case 'si':
-                    strings.push(isRich ? { richText: runs.runs } : plain);
-                    break;
-            }
+            if (runs.close(localName(name)) !== 'container')
+                return;
+            strings.push(runs.isRich ? { richText: runs.runs } : runs.plainText);
         },
     });
     return strings;

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

@@ -1,5 +1,5 @@
 import { type Font, type TableStyleTable } from '../../core/style.ts';
-import { type XmlAttributes } from '../../xml/xml-read.ts';
+import { type XmlAttributes } from '../../xml/xml-scan.ts';
 import { type StyleTable } from '../style/xf-style.ts';
 export type FontDraft = {
     -readonly [K in keyof Font]?: Font[K];