@shbernal/ts-xlsx 1.3.1 → 2.1.0

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

@@ -10,7 +10,7 @@
  * container rather than the spreadsheet inside it, and live in `../opc/namespaces.ts`.
  */
 /**
- * SpreadsheetML main namespace — the default `xmlns` of the workbook,
+ * SpreadsheetML main namespace: the default `xmlns` of the workbook,
  * worksheet, styles, sharedStrings, comments, table and pivot parts.
  */
 export declare const SPREADSHEETML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
@@ -25,7 +25,7 @@ export declare const MARKUP_COMPATIBILITY_NS = "http://schemas.openxmlformats.or
  */
 export declare const REVISION_NS = "http://schemas.microsoft.com/office/spreadsheetml/2014/revision";
 /**
- * The 2018 threaded-comments namespace, shared by both parts of the feature — a sheet's
+ * The 2018 threaded-comments namespace, shared by both parts of the feature: a sheet's
  * `threadedComment{n}.xml` and the workbook's `person.xml`. Note the plural `threadedcomments`, all
  * lower-case: Excel matches the URI exactly and reads neither part under any other spelling.
  */

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 { applyThemeOverrides } from './theme-xml.js';
 export class SheetRelIds {
     #next = 1;
     next() {
@@ -75,10 +76,12 @@ export function planPreservedParts(workbook, generatedDrawingCount, generatedMed
                     ? []
                     : [{ id: rel.id, type: rel.type, target: relativePartPath(newPath, target) }];
             });
-            const authoredTheme = newPath === THEME_PART_PATH ? workbook.authoredThemeXml() : undefined;
+            const overrides = newPath === THEME_PART_PATH ? workbook.themeOverrides : undefined;
             emitted.set(newPath, {
                 path: newPath,
-                bytes: authoredTheme === undefined ? part.bytes : new TextEncoder().encode(authoredTheme),
+                bytes: overrides === undefined
+                    ? part.bytes
+                    : 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),

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

@@ -1,5 +1,5 @@
-import { pivotMetricFromSubtotal, } from '../../core/pivot-table.js';
-import { localName, parseXml } from '../../xml/xml-read.js';
+import { isDeclarablePivotSourceKind, pivotMetricFromSubtotal, } from '../../core/pivot-table.js';
+import { localName, numInteger, parseXml } from '../../xml/xml-read.js';
 export function parsePivotTable(tableXml, cacheXml) {
     const { fields, source } = parsePivotCacheDefinition(cacheXml);
     const def = parsePivotTableDefinition(tableXml);
@@ -85,20 +85,11 @@ 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) {
-    if (value === undefined)
-        return -1;
-    const index = Number(value);
-    return Number.isInteger(index) && index >= 0 ? index : -1;
+    return numInteger(value, 0) ?? -1;
 }

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

@@ -8,7 +8,7 @@ export interface ReadSheetRowsOptions extends ReadXlsxOptions {
     readonly sheet?: string | number;
 }
 /**
- * The resolved style facets of a streamed cell — its own `<c s>` cell format, flattened exactly as
+ * The resolved style facets of a streamed cell: its own `<c s>` cell format, flattened exactly as
  * the buffered reader resolves it. Present only when the cell carries a format; a consumer can copy
  * these straight onto a writer cell to preserve its look through a streaming read→write.
  */
@@ -19,7 +19,7 @@ export interface StreamedCell {
     readonly col: number;
     /** Canonical A1 address (`"B3"`). */
     readonly address: string;
-    /** The decoded value — identical to what `readXlsx` would produce for the same cell. */
+    /** The decoded value, identical to what `readXlsx` would produce for the same cell. */
     readonly value: CellValue;
     /** The cell's resolved style facets, or absent when the cell carries no format of its own. */
     readonly style?: StreamedCellStyle;
@@ -39,14 +39,14 @@ export interface StreamedRow {
  *
  * The two summaries are resolved lazily: reading either accessor drives a full scan of the sheet if
  * its rows have not already been consumed, so their order relative to `rows()` never matters. (When
- * rows *are* consumed first — the streaming idiom — the accessors reuse that pass and re-scan
+ * rows *are* consumed first, the streaming idiom, the accessors reuse that pass and re-scan
  * nothing.)
  */
 export interface StreamedSheet {
-    /** The worksheet's declared name, joined from the workbook part — never a positional placeholder. */
+    /** The worksheet's declared name, joined from the workbook part. Never a positional placeholder. */
     readonly name: string;
     /** Stream this sheet's rows, one at a time, in sheet order. */
-    rows(): Generator<StreamedRow>;
+    rows(): Generator<StreamedRow, void, undefined>;
     /** 1-based indices of columns the sheet declares hidden, ascending. */
     readonly hiddenColumns: readonly number[];
     /** The sheet's merged ranges, as canonical A1 range strings, in declaration order. */
@@ -55,31 +55,31 @@ export interface StreamedSheet {
 /**
  * Stream a worksheet's rows from an `.xlsx` package, yielding each in sheet order without building
  * the workbook model. Only rows the sheet actually declares are yielded, and within a row only its
- * non-empty cells — a blank or style-only cell contributes nothing, matching the intent of a data
+ * non-empty cells: a blank or style-only cell contributes nothing, matching the intent of a data
  * read.
  *
  * @param data The raw `.xlsx` bytes.
  * @param options Sheet selector and the inflate bound (see {@link ReadSheetRowsOptions}).
  * @throws {UnsupportedFormatError} if the input is not a readable `.xlsx` package (a legacy `.xls`, a
- *   binary `.xlsb`, or an unrecognised/non-ZIP blob — branch on `.format`).
- * @throws {PackageReadError} if the input is a ZIP that cannot be unpacked — a corrupt or
+ *   binary `.xlsb`, or an unrecognised/non-ZIP blob; branch on `.format`).
+ * @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).
  * @throws {XlsxParseError} if the package's workbook part declares no worksheets.
  * @throws {RangeError} / {@link AuthoringError} if `options.sheet` selects a position, or a name,
  *   that no worksheet has.
  */
-export declare function readSheetRows(data: Uint8Array, options?: ReadSheetRowsOptions): Generator<StreamedRow>;
+export declare function readSheetRows(data: Uint8Array, options?: ReadSheetRowsOptions): Generator<StreamedRow, void, undefined>;
 /**
  * Stream every worksheet of an `.xlsx` package in workbook order, without building the workbook
  * model. Each yielded {@link StreamedSheet} carries the declared sheet name and lets the caller
- * stream that sheet's rows and read its hidden-column and merge summaries — the streaming analogue
+ * stream that sheet's rows and read its hidden-column and merge summaries: the streaming analogue
  * of walking `readXlsx(data).worksheets`.
  *
  * @param data The raw `.xlsx` bytes.
  * @param options The inflate bound (see {@link ReadXlsxOptions}).
  * @throws {UnsupportedFormatError} if the input is not a readable `.xlsx` package (a legacy `.xls`, a
- *   binary `.xlsb`, or an unrecognised/non-ZIP blob — branch on `.format`).
- * @throws {PackageReadError} if the input is a ZIP that cannot be unpacked — a corrupt or
+ *   binary `.xlsb`, or an unrecognised/non-ZIP blob; branch on `.format`).
+ * @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 readWorkbookStream(data: Uint8Array, options?: ReadXlsxOptions): Generator<StreamedSheet>;
+export declare function readWorkbookStream(data: Uint8Array, options?: ReadXlsxOptions): Generator<StreamedSheet, void, undefined>;

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

@@ -1,12 +1,12 @@
-import { MAX_COLUMN } from '../../core/address.js';
+import { MAX_COLUMN, MAX_ROW } from '../../core/address.js';
 import { AuthoringError } from '../../errors.js';
-import { boolStrict, closeEmptyElements, localName, xmlEvents } from '../../xml/xml-read.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 { CellAccumulator } from './cell-accumulator.js';
 import { XlsxParseError } from './errors.js';
-import { DEFAULT_MAX_UNCOMPRESSED, parseRelationships, parseStyleTable, parseWorkbookSheets, resolveWorkbookPart, } from './read.js';
 import { parseSharedStrings } from './read-shared-strings.js';
+import { DEFAULT_MAX_UNCOMPRESSED, parseRelationships, parseStyleTable, parseWorkbookSheets, resolveWorkbookPart, } from './read.js';
 export function* readSheetRows(data, options = {}) {
     const pkg = openPackage(data, options.maxUncompressedBytes);
     const chosen = pickSheet(pkg.sheets, options.sheet);
@@ -102,13 +102,11 @@ function* scanSheet(xml, sharedStrings, xfStyles, hiddenColumns, merges) {
     let rowNumber = 0;
     let lastRow = 0;
     let rowHidden = false;
+    let rowInGrid = true;
     let cells = [];
-    const cell = new CellAccumulator();
-    let inInlineString = false;
-    let capture = false;
-    let text = '';
+    const cell = new CellAccumulator({ richRuns: false });
     const finalizeCell = () => {
-        if (cell.ref === '' || cell.col < 0)
+        if (cell.ref === '' || cell.col < 0 || !rowInGrid)
             return;
         const style = cell.styleIndex >= 0 ? xfStyles[cell.styleIndex] : undefined;
         const value = cell.decode(sharedStrings, style);
@@ -119,19 +117,18 @@ function* scanSheet(xml, sharedStrings, xfStyles, hiddenColumns, merges) {
     };
     for (const event of closeEmptyElements(xmlEvents(xml), CELL_EMPTY_CLOSE)) {
         if (event.kind === 'text') {
-            if (capture)
-                text += event.text;
+            cell.appendChunk(event.text);
             continue;
         }
         if (event.kind === 'open') {
             const local = localName(event.name);
-            text = '';
-            capture = false;
+            if (cell.openElement(local, event.attrs, event.selfClosing))
+                continue;
             switch (local) {
                 case 'row': {
-                    const declared = Number(event.attrs.r);
-                    rowNumber = Number.isInteger(declared) && declared >= 1 ? declared : lastRow + 1;
+                    rowNumber = numInteger(event.attrs.r, 1) ?? lastRow + 1;
                     lastRow = rowNumber;
+                    rowInGrid = rowNumber <= MAX_ROW;
                     rowHidden = boolStrict(event.attrs.hidden);
                     cells = [];
                     break;
@@ -143,60 +140,27 @@ function* scanSheet(xml, sharedStrings, xfStyles, hiddenColumns, merges) {
                     if (event.attrs.ref !== undefined)
                         merges.push(event.attrs.ref);
                     break;
-                case 'c':
-                    cell.beginCell(event.attrs);
-                    break;
-                case 'is':
-                    inInlineString = true;
-                    cell.beginInlineString();
-                    break;
-                case 'f':
-                    capture = true;
-                    cell.beginFormula(event.attrs, event.selfClosing);
-                    break;
-                case 'v':
-                case 't':
-                    capture = true;
-                    break;
                 default:
                     break;
             }
-            if (event.selfClosing && (local === 'f' || local === 'v'))
-                capture = false;
             continue;
         }
         const local = localName(event.name);
-        switch (local) {
-            case 'f':
-                cell.setFormula(text);
-                break;
-            case 'v':
-                cell.setValue(text);
-                break;
-            case 't':
-                cell.appendText(text, inInlineString);
-                break;
-            case 'is':
-                inInlineString = false;
-                break;
-            case 'c':
-                finalizeCell();
-                break;
-            case 'row':
+        const claimed = cell.closeElement(local);
+        if (claimed === 'cell')
+            finalizeCell();
+        else if (claimed === 'other' && local === 'row') {
+            if (rowInGrid)
                 yield { number: rowNumber, hidden: rowHidden, cells };
-                break;
-            default:
-                break;
         }
-        capture = false;
     }
 }
 function collectHiddenColumn(attrs, hiddenColumns) {
     if (attrs.hidden !== '1' && attrs.hidden !== 'true')
         return;
-    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)
         return;
     const last = Math.min(max, MAX_COLUMN);
     for (let index = min; index <= last; index++)

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

@@ -4,55 +4,18 @@ 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.reset();
-                    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':
-                    if (!runs.appendText(text))
-                        plain += text;
-                    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

@@ -9,7 +9,7 @@ export declare function applyFontChild(draft: FontDraft, local: string, attrs: X
 /**
  * Extract the custom indexed-color palette (`<colors><indexedColors>`) from styles.xml as verbatim
  * `<rgbColor rgb="…"/>` fragments, or an empty list when the file rides the default palette. Kept raw
- * — rather than parsed into RGB and re-serialised — so the exact entries (count, order, casing) a
+ * rather than parsed into RGB and re-serialised, so the exact entries (count, order, casing) a
  * source file declared survive a round-trip and every `indexed="…"` reference keeps its RGB.
  */
 export declare function parseIndexedColors(stylesXml: string): string[];
@@ -25,8 +25,8 @@ export declare function parseMruColors(stylesXml: string): string[];
  * container's nominated `defaultTableStyle`/`defaultPivotStyle`. See {@link TableStyleTable} for why
  * the definitions stay raw while the two names are decoded.
  *
- * A file with no such block — or with the self-closing `count="0"` container Excel writes when it has
- * only defaults to state — yields an empty {@link TableStyleTable.styles} and whichever names it did
+ * A file with no such block, or with the self-closing `count="0"` container Excel writes when it has
+ * only defaults to state, yields an empty {@link TableStyleTable.styles} and whichever names it did
  * carry.
  */
 export declare function parseTableStyles(stylesXml: string): TableStyleTable;

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

@@ -1,9 +1,10 @@
-import { assignStyleFacets, isBorderStyle, isFillPatternType, isFontScheme, isFontVerticalAlignment, isHorizontalAlignment, isNamedUnderlineStyle, isVerticalAlignment, } from '../../core/style.js';
-import { boolPresent, boolStrict, closeEmptyElements, localName, openElements, xmlEvents, } from '../../xml/xml-read.js';
-import { numFmtCodeFor } from '../style/xf-style.js';
+import { isBorderStyle, isFillPatternType, isFontScheme, isFontVerticalAlignment, isHorizontalAlignment, isNamedUnderlineStyle, isVerticalAlignment, } from '../../core/style.js';
+import { boolPresent, boolStrict, closeEmptyElements, localName, numFinite, numInteger, openElements, xmlEvents, } from '../../xml/xml-read.js';
+import { numFmtCodeFor, resolveStyleTable, } from '../style/xf-style.js';
 import { parseColor } from './color-xml.js';
 const BORDER_EDGE_NAMES = ['left', 'right', 'top', 'bottom', 'diagonal'];
 const BORDER_EDGES = new Set(BORDER_EDGE_NAMES);
+const isBorderEdgeName = (name) => BORDER_EDGES.has(name);
 const STYLE_EMPTY_CLOSES = new Set([
     'font',
     'border',
@@ -53,24 +54,7 @@ export function parseStyleTable(xml) {
         }
         next = events.next();
     }
-    const cellXfs = xfStyles.map((xf) => {
-        if (xf.xfId === undefined)
-            return xf;
-        const named = namedXfs[xf.xfId];
-        return named === undefined ? xf : { ...named, ...xf };
-    });
-    const namedStyles = namedXfs.map((xf, index) => {
-        const label = cellStyleNames.find((entry) => entry.xfId === index);
-        const style = {};
-        assignStyleFacets(style, xf);
-        if (label?.name !== undefined)
-            style.name = label.name;
-        if (label?.builtinId !== undefined)
-            style.builtinId = label.builtinId;
-        return style;
-    });
-    const defaultFont = fonts[0];
-    return defaultFont === undefined ? { cellXfs, namedStyles } : { cellXfs, namedStyles, defaultFont };
+    return resolveStyleTable({ directXfs: xfStyles, namedXfs, labels: cellStyleNames, fonts });
 }
 function* until(events, container) {
     let next = events.next();
@@ -86,8 +70,8 @@ function parseNumFmts(events) {
     const codes = new Map();
     for (const event of until(events, 'numFmts')) {
         if (event.kind === 'open' && localName(event.name) === 'numFmt') {
-            const id = Number(event.attrs.numFmtId);
-            if (Number.isInteger(id) && id > 0 && event.attrs.formatCode !== undefined) {
+            const id = numInteger(event.attrs.numFmtId, 1);
+            if (id !== undefined && event.attrs.formatCode !== undefined) {
                 codes.set(id, event.attrs.formatCode);
             }
         }
@@ -151,8 +135,7 @@ function parseFills(events) {
                     break;
                 case 'stop':
                     if (gradientDraft !== null) {
-                        const position = Number(attrs.position);
-                        gradientDraft.stopPosition = Number.isFinite(position) ? position : 0;
+                        gradientDraft.stopPosition = numFinite(attrs.position) ?? 0;
                         gradientDraft.stopColor = undefined;
                     }
                     break;
@@ -210,7 +193,7 @@ function parseBorders(events) {
                     borderDraft.diagonalDown = true;
             }
             else if (borderDraft !== null) {
-                if (BORDER_EDGES.has(local)) {
+                if (isBorderEdgeName(local)) {
                     if (attrs.style !== undefined && isBorderStyle(attrs.style)) {
                         currentEdge = local;
                         borderDraft[currentEdge] = { style: attrs.style };
@@ -271,12 +254,12 @@ function parseXfTable(events, container, deps) {
     return xfs;
 }
 function resolveXf(attrs, deps, captureXfId) {
-    const fillId = Number(attrs.fillId);
-    const fill = Number.isInteger(fillId) ? deps.fills[fillId] : undefined;
-    const fontId = Number(attrs.fontId);
-    const font = Number.isInteger(fontId) ? deps.fonts[fontId] : undefined;
-    const borderId = Number(attrs.borderId);
-    const border = Number.isInteger(borderId) && borderId > 0 ? deps.borders[borderId] : undefined;
+    const fillId = numInteger(attrs.fillId, 0);
+    const fill = fillId !== undefined ? deps.fills[fillId] : undefined;
+    const fontId = numInteger(attrs.fontId, 0);
+    const font = fontId !== undefined ? deps.fonts[fontId] : undefined;
+    const borderId = numInteger(attrs.borderId, 1);
+    const border = borderId !== undefined ? deps.borders[borderId] : undefined;
     const numFmt = resolveNumFmt(attrs.numFmtId, deps.numFmtCodes);
     const draft = {};
     if (fill)
@@ -289,9 +272,9 @@ function resolveXf(attrs, deps, captureXfId) {
         draft.border = border;
     if (boolStrict(attrs.quotePrefix))
         draft.quotePrefix = true;
-    if (captureXfId && attrs.xfId !== undefined) {
-        const xfId = Number(attrs.xfId);
-        if (Number.isInteger(xfId) && xfId > 0)
+    if (captureXfId) {
+        const xfId = numInteger(attrs.xfId, 1);
+        if (xfId !== undefined)
             draft.xfId = xfId;
     }
     return draft;
@@ -301,16 +284,14 @@ function parseCellStyles(events) {
     for (const event of until(events, 'cellStyles')) {
         if (event.kind === 'open' && localName(event.name) === 'cellStyle') {
             const attrs = event.attrs;
-            const xfId = Number(attrs.xfId);
-            if (Number.isInteger(xfId)) {
+            const xfId = numInteger(attrs.xfId);
+            if (xfId !== undefined) {
                 const entry = { xfId };
                 if (attrs.name !== undefined)
                     entry.name = attrs.name;
-                if (attrs.builtinId !== undefined) {
-                    const builtinId = Number(attrs.builtinId);
-                    if (Number.isInteger(builtinId))
-                        entry.builtinId = builtinId;
-                }
+                const builtinId = numInteger(attrs.builtinId);
+                if (builtinId !== undefined)
+                    entry.builtinId = builtinId;
                 names.push(entry);
             }
         }
@@ -346,8 +327,8 @@ export function applyFontChild(draft, local, attrs) {
                 draft.vertAlign = attrs.val;
             break;
         case 'sz': {
-            const size = Number(attrs.val);
-            if (Number.isFinite(size))
+            const size = numFinite(attrs.val);
+            if (size !== undefined)
                 draft.size = size;
             break;
         }
@@ -360,14 +341,14 @@ export function applyFontChild(draft, local, attrs) {
                 draft.name = attrs.val;
             break;
         case 'family': {
-            const family = Number(attrs.val);
-            if (Number.isInteger(family))
+            const family = numInteger(attrs.val);
+            if (family !== undefined)
                 draft.family = family;
             break;
         }
         case 'charset': {
-            const charset = Number(attrs.val);
-            if (Number.isInteger(charset))
+            const charset = numInteger(attrs.val);
+            if (charset !== undefined)
                 draft.charset = charset;
             break;
         }
@@ -380,7 +361,8 @@ export function applyFontChild(draft, local, attrs) {
     }
 }
 function resolveNumFmt(raw, custom) {
-    return raw === undefined ? undefined : numFmtCodeFor(Number(raw), custom);
+    const id = numInteger(raw, 1);
+    return id === undefined ? undefined : numFmtCodeFor(id, custom);
 }
 function toFill(pattern, fgColor, bgColor) {
     if (!isFillPatternType(pattern) || pattern === 'none')
@@ -394,8 +376,8 @@ function toFill(pattern, fgColor, bgColor) {
 }
 function assignGradientNumbers(fill, attrs) {
     for (const key of ['degree', 'left', 'right', 'top', 'bottom']) {
-        const value = Number(attrs[key]);
-        if (attrs[key] !== undefined && Number.isFinite(value))
+        const value = numFinite(attrs[key]);
+        if (value !== undefined)
             fill[key] = value;
     }
 }
@@ -414,25 +396,19 @@ function parseAlignment(attrs) {
     }
     if (attrs.vertical !== undefined && isVerticalAlignment(attrs.vertical))
         out.vertical = attrs.vertical;
-    if (attrs.textRotation !== undefined) {
-        const rotation = Number(attrs.textRotation);
-        if (Number.isFinite(rotation) && rotation !== 0)
-            out.textRotation = rotation;
-    }
+    const rotation = numFinite(attrs.textRotation);
+    if (rotation !== undefined && rotation !== 0)
+        out.textRotation = rotation;
     if (boolStrict(attrs.wrapText))
         out.wrapText = true;
-    if (attrs.indent !== undefined) {
-        const indent = Number(attrs.indent);
-        if (Number.isInteger(indent) && indent !== 0)
-            out.indent = indent;
-    }
+    const indent = numInteger(attrs.indent);
+    if (indent !== undefined && indent !== 0)
+        out.indent = indent;
     if (boolStrict(attrs.shrinkToFit))
         out.shrinkToFit = true;
-    if (attrs.readingOrder !== undefined) {
-        const order = Number(attrs.readingOrder);
-        if (Number.isInteger(order) && order !== 0)
-            out.readingOrder = order;
-    }
+    const order = numInteger(attrs.readingOrder);
+    if (order !== undefined && order !== 0)
+        out.readingOrder = order;
     return Object.keys(out).length > 0 ? out : undefined;
 }
 function parseProtection(attrs) {