@shbernal/ts-xlsx 1.3.1 → 2.1.0

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

@@ -1,9 +1,10 @@
-import { decodeRange } from '../../core/address.js';
+import { MAX_COLUMN, MAX_ROW, tryDecodeRange } from '../../core/address.js';
 import { isCustomFilterOperator, } from '../../core/autofilter.js';
 import { INTERNAL } from '../../core/internal.js';
+import { isPageOrder, isPageOrientation, } from '../../core/page-setup.js';
 import { SHEET_PROTECTION_FLAGS, } from '../../core/protection.js';
 import { assignStyleFacets } from '../../core/style.js';
-import { boolPresent, boolStrict, boolTristate, localName, parseXml, } from '../../xml/xml-read.js';
+import { boolPresent, boolStrict, boolTristate, decodeSpreadsheetText, enumToken, localName, numFinite, numInteger, parseXml, } from '../../xml/xml-read.js';
 import { CellAccumulator } from './cell-accumulator.js';
 import { parseColor } from './color-xml.js';
 const MARGIN_SIDES = ['left', 'right', 'top', 'bottom', 'header', 'footer'];
@@ -27,20 +28,18 @@ function parseSheetProtection(attrs) {
             flags[key] = !boolStrict(raw);
     }
     const { algorithmName, hashValue, saltValue, spinCount } = attrs;
+    const spin = numInteger(spinCount, 0);
     if (algorithmName !== undefined &&
         hashValue !== undefined &&
         saltValue !== undefined &&
-        spinCount !== undefined) {
-        const spin = Number(spinCount);
-        if (Number.isFinite(spin)) {
-            const credential = {
-                algorithmName,
-                hashValue,
-                saltValue,
-                spinCount: spin,
-            };
-            return { flags, credential };
-        }
+        spin !== undefined) {
+        const credential = {
+            algorithmName,
+            hashValue,
+            saltValue,
+            spinCount: spin,
+        };
+        return { flags, credential };
     }
     return { flags };
 }
@@ -57,7 +56,7 @@ class AutoFilterAccumulator {
         this.#columns = [];
     }
     beginColumn(attrs) {
-        this.#colId = attrs.colId !== undefined ? Number(attrs.colId) : -1;
+        this.#colId = numInteger(attrs.colId, 0) ?? -1;
         this.#values = null;
         this.#blank = false;
         this.#predicates = null;
@@ -92,13 +91,13 @@ class AutoFilterAccumulator {
     commit(sheet) {
         if (this.#ref === null)
             return;
-        try {
-            const { left, right } = decodeRange(this.#ref);
-            const width = left !== undefined && right !== undefined ? right - left + 1 : 0;
+        const decoded = tryDecodeRange(this.#ref);
+        const left = decoded?.left;
+        const right = decoded?.right;
+        if (left !== undefined && right !== undefined) {
+            const width = right - left + 1;
             sheet.autoFilter = { ref: this.#ref, columns: this.#columns.filter((c) => c.colId < width) };
         }
-        catch {
-        }
         this.#ref = null;
         this.#columns = [];
     }
@@ -114,12 +113,12 @@ class PageBreakAccumulator {
     add(attrs) {
         if (this.#target === null)
             return;
-        const id = Number(attrs.id);
-        if (!Number.isInteger(id) || id < 1)
+        const id = numInteger(attrs.id, 1);
+        if (id === undefined)
             return;
         const brk = { id };
-        const max = Number(attrs.max);
-        if (Number.isInteger(max) && max >= 0)
+        const max = numInteger(attrs.max, 0);
+        if (max !== undefined)
             brk.max = max;
         if (boolStrict(attrs.man))
             brk.man = true;
@@ -127,10 +126,7 @@ class PageBreakAccumulator {
     }
 }
 export function parseWorksheet(xml, sheet, sharedStrings, xfStyles) {
-    const cell = new CellAccumulator();
-    let inInlineString = false;
-    let capture = false;
-    let text = '';
+    const cell = new CellAccumulator({ richRuns: true });
     let rowStyle = -1;
     let rowCustomFormat = false;
     const autoFilter = new AutoFilterAccumulator();
@@ -148,46 +144,24 @@ export function parseWorksheet(xml, sheet, sharedStrings, xfStyles) {
     parseXml(xml, {
         onOpen(name, attrs, selfClosing) {
             const local = localName(name);
-            text = '';
-            capture = false;
+            if (cell.openElement(local, attrs, selfClosing))
+                return;
             switch (local) {
                 case 'col':
                     applyColumn(sheet, attrs, xfStyles, columnStyle);
                     break;
                 case 'row':
                     applyRow(sheet, attrs);
-                    rowStyle = attrs.s !== undefined ? Number(attrs.s) : -1;
+                    rowStyle = numInteger(attrs.s, 0) ?? -1;
                     rowCustomFormat = boolStrict(attrs.customFormat);
                     break;
-                case 'c':
-                    cell.beginCell(attrs);
-                    break;
-                case 'is':
-                    inInlineString = true;
-                    cell.beginInlineString();
-                    break;
-                case 'r':
-                    if (inInlineString)
-                        cell.runs.beginRun();
-                    break;
-                case 'rPr':
-                    cell.runs.beginProperties();
-                    break;
-                case 'f':
-                    capture = true;
-                    cell.beginFormula(attrs, selfClosing);
-                    break;
-                case 'v':
-                case 't':
-                    capture = true;
-                    break;
                 case 'oddHeader':
                 case 'oddFooter':
                 case 'evenHeader':
                 case 'evenFooter':
                 case 'firstHeader':
                 case 'firstFooter':
-                    capture = true;
+                    cell.capture();
                     break;
                 case 'mergeCell':
                     if (attrs.ref !== undefined && attrs.ref !== '') {
@@ -241,45 +215,28 @@ export function parseWorksheet(xml, sheet, sharedStrings, xfStyles) {
                 case 'customFilter':
                     autoFilter.addCustom(attrs);
                     break;
-                default:
-                    cell.runs.applyProperty(local, attrs);
-                    break;
             }
-            if (selfClosing && (local === 'f' || local === 'v'))
-                capture = false;
         },
         onText(chunk) {
-            if (capture)
-                text += chunk;
+            cell.appendChunk(chunk);
         },
         onClose(name) {
             const local = localName(name);
+            const claimed = cell.closeElement(local);
+            if (claimed === 'cell') {
+                finalizeCellFromState();
+                return;
+            }
+            if (claimed === 'claimed')
+                return;
             switch (local) {
-                case 'f':
-                    cell.setFormula(text);
-                    break;
-                case 'v':
-                    cell.setValue(text);
-                    break;
-                case 't':
-                    cell.appendText(text, inInlineString);
-                    break;
-                case 'r':
-                    cell.runs.endRun();
-                    break;
-                case 'is':
-                    inInlineString = false;
-                    break;
                 case 'oddHeader':
                 case 'oddFooter':
                 case 'evenHeader':
                 case 'evenFooter':
                 case 'firstHeader':
                 case 'firstFooter':
-                    sheet.headerFooter[local] = text;
-                    break;
-                case 'c':
-                    finalizeCellFromState();
+                    sheet.headerFooter[local] = decodeSpreadsheetText(cell.capturedText);
                     break;
                 case 'row':
                     rowStyle = -1;
@@ -298,7 +255,6 @@ export function parseWorksheet(xml, sheet, sharedStrings, xfStyles) {
                 default:
                     break;
             }
-            capture = false;
         },
     }, { closeEmptyElements: WORKSHEET_EMPTY_CLOSES });
 }
@@ -321,10 +277,12 @@ function applySheetProperties(local, attrs, sheet) {
         case 'pane':
             if (attrs.state === 'frozen' || attrs.state === 'frozenSplit') {
                 sheet.view.state = 'frozen';
-                if (attrs.xSplit !== undefined)
-                    sheet.view.xSplit = Number(attrs.xSplit);
-                if (attrs.ySplit !== undefined)
-                    sheet.view.ySplit = Number(attrs.ySplit);
+                const xSplit = numInteger(attrs.xSplit, 0);
+                const ySplit = numInteger(attrs.ySplit, 0);
+                if (xSplit !== undefined)
+                    sheet.view.xSplit = xSplit;
+                if (ySplit !== undefined)
+                    sheet.view.ySplit = ySplit;
                 if (attrs.topLeftCell !== undefined)
                     sheet.view.topLeftCell = attrs.topLeftCell;
             }
@@ -345,25 +303,24 @@ function applySheetProperties(local, attrs, sheet) {
     }
 }
 function applyColumn(sheet, attrs, xfStyles, columnStyle) {
-    const min = Number(attrs.min);
-    const max = Number(attrs.max);
-    if (!Number.isInteger(min) || !Number.isInteger(max) || min < 1)
+    const min = numInteger(attrs.min, 1);
+    const max = numInteger(attrs.max, 1);
+    if (min === undefined || max === undefined || min > MAX_COLUMN)
         return;
-    const width = attrs.width !== undefined ? Number(attrs.width) : undefined;
+    const last = Math.min(max, MAX_COLUMN);
+    const width = numFinite(attrs.width);
     const hidden = boolStrict(attrs.hidden);
-    const styleIndex = attrs.style !== undefined ? Number(attrs.style) : -1;
+    const styleIndex = numInteger(attrs.style, 0) ?? -1;
     const style = styleIndex >= 0 ? xfStyles[styleIndex] : undefined;
-    for (let index = min; index <= max; index++) {
+    for (let index = min; index <= last; index++) {
         const column = sheet.getColumn(index);
-        if (width !== undefined && Number.isFinite(width) && attrs.customWidth !== '0')
+        if (width !== undefined && boolPresent(attrs.customWidth))
             column.width = width;
         if (hidden)
             column.hidden = true;
-        if (attrs.outlineLevel !== undefined) {
-            const level = Number(attrs.outlineLevel);
-            if (Number.isInteger(level) && level > 0)
-                column.outlineLevel = level;
-        }
+        const outlineLevel = numInteger(attrs.outlineLevel, 1);
+        if (outlineLevel !== undefined)
+            column.outlineLevel = outlineLevel;
         if (boolStrict(attrs.collapsed))
             column.collapsed = true;
         if (style !== undefined)
@@ -373,22 +330,18 @@ function applyColumn(sheet, attrs, xfStyles, columnStyle) {
     }
 }
 function applyRow(sheet, attrs) {
-    const number = Number(attrs.r);
-    if (!Number.isInteger(number) || number < 1)
+    const number = numInteger(attrs.r, 1);
+    if (number === undefined || number > MAX_ROW)
         return;
     const row = sheet.getRow(number);
-    if (attrs.ht !== undefined && attrs.customHeight !== '0') {
-        const height = Number(attrs.ht);
-        if (Number.isFinite(height))
-            row.height = height;
-    }
+    const height = numFinite(attrs.ht);
+    if (height !== undefined && boolPresent(attrs.customHeight))
+        row.height = height;
     if (boolStrict(attrs.hidden))
         row.hidden = true;
-    if (attrs.outlineLevel !== undefined) {
-        const level = Number(attrs.outlineLevel);
-        if (Number.isInteger(level) && level > 0)
-            row.outlineLevel = level;
-    }
+    const outlineLevel = numInteger(attrs.outlineLevel, 1);
+    if (outlineLevel !== undefined)
+        row.outlineLevel = outlineLevel;
     if (boolStrict(attrs.collapsed))
         row.collapsed = true;
 }
@@ -411,37 +364,28 @@ function applyPrintOptions(printOptions, attrs) {
 }
 function applyMargins(margins, attrs) {
     for (const side of MARGIN_SIDES) {
-        const raw = attrs[side];
-        if (raw === undefined)
-            continue;
-        const value = Number(raw);
-        if (Number.isFinite(value))
+        const value = numFinite(attrs[side]);
+        if (value !== undefined)
             margins[side] = value;
     }
 }
 function applyPageSetup(pageSetup, attrs) {
-    const num = (raw) => {
-        if (raw === undefined)
-            return undefined;
-        const value = Number(raw);
-        return Number.isFinite(value) ? value : undefined;
-    };
-    const paperSize = num(attrs.paperSize);
+    const paperSize = numInteger(attrs.paperSize, 0);
     if (paperSize !== undefined)
         pageSetup.paperSize = paperSize;
-    const scale = num(attrs.scale);
+    const scale = numInteger(attrs.scale, 0);
     if (scale !== undefined)
         pageSetup.scale = scale;
-    const fitToWidth = num(attrs.fitToWidth);
+    const fitToWidth = numInteger(attrs.fitToWidth, 0);
     if (fitToWidth !== undefined)
         pageSetup.fitToWidth = fitToWidth;
-    const fitToHeight = num(attrs.fitToHeight);
+    const fitToHeight = numInteger(attrs.fitToHeight, 0);
     if (fitToHeight !== undefined)
         pageSetup.fitToHeight = fitToHeight;
-    if (attrs.pageOrder === 'downThenOver' || attrs.pageOrder === 'overThenDown') {
-        pageSetup.pageOrder = attrs.pageOrder;
-    }
-    if (attrs.orientation === 'portrait' || attrs.orientation === 'landscape') {
-        pageSetup.orientation = attrs.orientation;
-    }
+    const pageOrder = enumToken(attrs.pageOrder, isPageOrder);
+    if (pageOrder !== undefined)
+        pageSetup.pageOrder = pageOrder;
+    const orientation = enumToken(attrs.orientation, isPageOrientation);
+    if (orientation !== undefined)
+        pageSetup.orientation = orientation;
 }

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

@@ -1,6 +1,5 @@
 import { Workbook, type WorkbookView } from '../../core/workbook.ts';
-import { type WorkbookProtection } from '../../core/workbook-protection.ts';
-import type { WorksheetState } from '../../core/worksheet.ts';
+import { type WorksheetState } from '../../core/worksheet.ts';
 import { type ReadXlsxOptions } from '../opc/read-options.ts';
 export { parseRelationships, resolveWorkbookPart } from '../opc/read-opc.ts';
 export { DEFAULT_MAX_UNCOMPRESSED, type ReadXlsxOptions } from '../opc/read-options.ts';
@@ -11,14 +10,14 @@ export { parseStyleTable } from './read-styles.ts';
  *
  * Both OOXML serialisations are accepted: an XML `.xlsx`, and a binary `.xlsb` (BIFF12), which is the
  * same OPC container with binary office-document parts. The two are auto-detected from the package
- * itself rather than from a file extension, so a caller never branches on which form it holds — and
+ * itself rather than from a file extension, so a caller never branches on which form it holds, and
  * the model produced is the same either way. See `../xlsb/read.ts` for what the binary path does not
  * yet decode.
  *
- * @throws {UnsupportedFormatError} if the input is neither — a legacy `.xls` (`.format === 'xls'`) or
+ * @throws {UnsupportedFormatError} if the input is neither: a legacy `.xls` (`.format === 'xls'`) or
  *   an unrecognised/non-ZIP blob (`'unknown'`).
  * @throws {XlsbParseError} if a binary `.xlsb` part is malformed.
- * @throws {PackageReadError} if the input is a ZIP that cannot be unpacked — a corrupt or
+ * @throws {PackageReadError} if the input is a ZIP that cannot be unpacked: a corrupt or
  *   truncated archive, or one exceeding the inflate bound (a probable zip bomb).
  */
 export declare function readXlsx(data: Uint8Array, options?: ReadXlsxOptions): Workbook;
@@ -28,5 +27,4 @@ export interface SheetEntry {
     readonly state?: WorksheetState['state'];
 }
 export declare function parseWorkbookSheets(xml: string): SheetEntry[];
-export declare function parseWorkbookProtection(xml: string): WorkbookProtection | undefined;
 export declare function applyWorkbookView(view: WorkbookView, xml: string): void;