@shbernal/ts-xlsx 3.2.2-next.24.g38fae0e → 3.2.2-next.26.gf63f249

package/dist/io/xlsx/sheet-properties.js

@@ -2,7 +2,7 @@ import { encodeAddress, MAX_COLUMN, MAX_ROW } from '../../core/address.js';
 import { isCustomFilterOperator, } from '../../core/autofilter.js';
 import { HEADER_FOOTER_ELEMENTS, MARGIN_SIDES, PAGE_SETUP_FACETS, PRINT_OPTION_FLAGS, } from '../../core/page-setup.js';
 import { isLegacyPasswordHash, SHEET_PROTECTION_FLAGS, } from '../../core/protection.js';
-import { assertWritableNumber, AuthoringError } from '../../errors.js';
+import { AuthoringError } from '../../errors.js';
 import { numFinite, numInteger } from '../../xml/xml-attrs.js';
 import { boolStrict, boolTristate } from '../../xml/xml-scan.js';
 import { boolAttr, checkedToken, escapeAttr, escapeSpreadsheetText, numAttr, numberText, } from '../../xml/xml.js';
@@ -29,7 +29,6 @@ export function sheetViewsXml(view, active) {
 function frozenSplit(name, value, lines) {
     if (value === undefined)
         return 0;
-    assertWritableNumber(value);
     if (!Number.isInteger(value) || value < 0 || value >= lines) {
         throw new AuthoringError(`cannot write ${name}="${value}": a frozen split is a whole count from 0 to ${lines - 1}`);
     }

package/dist/io/xlsx/style-elements.d.ts

@@ -1,7 +1,6 @@
 import { type Alignment, type Border, type Fill, type Protection } from '../../core/style.ts';
 import type { DifferentialStyle } from '../../core/workbook-styles.ts';
 export declare const CUSTOM_NUMFMT_BASE = 164;
-export declare const DEFAULT_FONT_BODY = "<sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/>";
 export declare const DEFAULT_BORDER = "<border><left/><right/><top/><bottom/><diagonal/></border>";
 export interface CellFormat {
     readonly fillId: number;

package/dist/io/xlsx/style-elements.js

@@ -3,7 +3,6 @@ import { checkedToken, escapeAttr, escapeFormatCode, nonDefaultNumAttr, numberTe
 import { colorAttrs } from './color-xml.js';
 import { fontXml } from './font-xml.js';
 export const CUSTOM_NUMFMT_BASE = 164;
-export const DEFAULT_FONT_BODY = '<sz val="11"/><color theme="1"/><name val="Calibri"/><family val="2"/><scheme val="minor"/>';
 export const DEFAULT_BORDER = '<border><left/><right/><top/><bottom/><diagonal/></border>';
 export const DEFAULT_FORMAT = {
     fillId: 0,

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

@@ -8,9 +8,9 @@ export interface StyleRegistryOptions {
     /**
      * The font every cell naming none of its own renders in, emitted as id 0. Take it from
      * {@link Workbook.defaultFont}, which resolves the authored/declared/theme chain and guarantees a
-     * complete entry. Omitted, the registry falls back to the Office default.
+     * complete entry.
      */
-    readonly defaultFont?: Font;
+    readonly defaultFont: Font;
     /**
      * The default font the *source package* declared, when a workbook was read
      * ({@link Workbook.declaredDefaultFont}). It also interns to id 0, which is what lets an authored
@@ -34,7 +34,7 @@ export interface StyleRegistryOptions {
  */
 export declare class StyleRegistry {
     #private;
-    constructor(options?: StyleRegistryOptions);
+    constructor(options: StyleRegistryOptions);
     /**
      * The `<cellXfs>` index for a composed cell/row/column style. A style with no facet needs
      * no entry and resolves to the default xf 0, so its owner emits no `s` attribute at all.

package/dist/io/xlsx/styles.js

@@ -3,7 +3,7 @@ import { TABLE_STYLE_ELEMENT_TYPES } from '../../core/table-style.js';
 import { escapeAttr, escapeFormatCode, nonDefaultNumAttr, XML_DECLARATION } from '../../xml/xml.js';
 import { fontXml } from './font-xml.js';
 import { MARKUP_COMPATIBILITY_NS, SPREADSHEETML_NS } from './namespaces.js';
-import { alignmentAttrs, borderXml, cellStyleTag, CUSTOM_NUMFMT_BASE, DEFAULT_BORDER, DEFAULT_FONT_BODY, DEFAULT_FORMAT, dxfXml, formatSignature, isDefaultFormat, patternFillXml, protectionAttrs, xfXml, } from './style-elements.js';
+import { alignmentAttrs, borderXml, cellStyleTag, CUSTOM_NUMFMT_BASE, DEFAULT_BORDER, DEFAULT_FORMAT, dxfXml, formatSignature, isDefaultFormat, patternFillXml, protectionAttrs, xfXml, } from './style-elements.js';
 const RESERVED_FILL_COUNT = 2;
 const RESERVED_FONT_COUNT = 1;
 const RESERVED_BORDER_COUNT = 1;
@@ -40,9 +40,8 @@ class InternTable {
 export class StyleRegistry {
     #defaultFontBody;
     #font0Bodies;
-    constructor(options = {}) {
-        this.#defaultFontBody =
-            options.defaultFont === undefined ? DEFAULT_FONT_BODY : fontXml(options.defaultFont);
+    constructor(options) {
+        this.#defaultFontBody = fontXml(options.defaultFont);
         this.#font0Bodies = new Set(options.declaredDefaultFont === undefined
             ? [this.#defaultFontBody]
             : [this.#defaultFontBody, fontXml(options.declaredDefaultFont)]);

package/dist/vba/cfb-format.d.ts

@@ -42,7 +42,6 @@ export declare const MINI_SECTOR_SHIFT = 6;
 export declare const FREESECT = 4294967295;
 export declare const ENDOFCHAIN = 4294967294;
 export declare const FATSECT = 4294967293;
-export declare const DIFSECT = 4294967292;
 /**
  * Sector values 0xFFFFFFFA..0xFFFFFFFF are the reserved markers above, not data-sector indices, so
  * any value at or above this ceiling is chain-terminal. A reader walking a hostile chain tests the
@@ -77,3 +76,9 @@ export declare const MAX_NAME_CHARS = 31;
  * name differently would read as missing a stream it has.
  */
 export declare function sameEntryName(a: string, b: string): boolean;
+/**
+ * A key equal for exactly the names {@link sameEntryName} treats as one entry, so a set of them can
+ * catch a collision without comparing every pair. The length is part of the key because uppercasing
+ * can change it (`ß` becomes `SS`), and 2.6.4 compares the original lengths first.
+ */
+export declare function entryNameKey(name: string): string;

package/dist/vba/cfb-format.js

@@ -32,7 +32,6 @@ export const MINI_SECTOR_SHIFT = 6;
 export const FREESECT = 0xffffffff;
 export const ENDOFCHAIN = 0xfffffffe;
 export const FATSECT = 0xfffffffd;
-export const DIFSECT = 0xfffffffc;
 export const MAX_REGULAR_SECTOR = 0xfffffffa;
 export const NOSTREAM = 0xffffffff;
 export const TYPE_EMPTY = 0;
@@ -43,5 +42,8 @@ export const MINI_STREAM_CUTOFF = 4096;
 export const DIR_ENTRY_SIZE = 128;
 export const MAX_NAME_CHARS = 31;
 export function sameEntryName(a, b) {
-    return a.length === b.length && a.toUpperCase() === b.toUpperCase();
+    return entryNameKey(a) === entryNameKey(b);
+}
+export function entryNameKey(name) {
+    return `${name.length}:${name.toUpperCase()}`;
 }

package/dist/vba/cfb-writer.js

@@ -1,5 +1,5 @@
 import { quoted } from '../errors.js';
-import { CFB_SIGNATURE, DIFSECT, DIR_ENTRY_FIELD, DIR_ENTRY_SIZE, ENDOFCHAIN, FATSECT, FREESECT, HEADER_DIFAT_SLOTS, HEADER_FIELD, MAX_NAME_CHARS, MINI_SECTOR_SHIFT, MINI_STREAM_CUTOFF, NOSTREAM, TYPE_ROOT, TYPE_STORAGE, TYPE_STREAM, } from './cfb-format.js';
+import { CFB_SIGNATURE, DIR_ENTRY_FIELD, DIR_ENTRY_SIZE, ENDOFCHAIN, entryNameKey, FATSECT, FREESECT, HEADER_DIFAT_SLOTS, HEADER_FIELD, MAX_NAME_CHARS, MINI_SECTOR_SHIFT, MINI_STREAM_CUTOFF, NOSTREAM, TYPE_ROOT, TYPE_STORAGE, TYPE_STREAM, } from './cfb-format.js';
 import { VbaAuthorError } from './errors.js';
 export function isStream(node) {
     return 'data' in node;
@@ -75,17 +75,11 @@ export function writeCompoundFile(root) {
         miniStreamSectors +
         bigStreams.reduce((total, big) => total + big.sectors, 0);
     let fatSectors = 0;
-    let difatSectors = 0;
     for (;;) {
-        const total = baseSectors + fatSectors + difatSectors;
-        const needFat = Math.ceil(total / FAT_ENTRIES_PER_SECTOR);
-        const needDifat = needFat > HEADER_DIFAT_SLOTS
-            ? Math.ceil((needFat - HEADER_DIFAT_SLOTS) / (FAT_ENTRIES_PER_SECTOR - 1))
-            : 0;
-        if (needFat === fatSectors && needDifat === difatSectors)
+        const needFat = Math.ceil((baseSectors + fatSectors) / FAT_ENTRIES_PER_SECTOR);
+        if (needFat === fatSectors)
             break;
         fatSectors = needFat;
-        difatSectors = needDifat;
     }
     if (fatSectors > HEADER_DIFAT_SLOTS) {
         throw new VbaAuthorError(`project needs ${fatSectors} FAT sectors, exceeding the ${HEADER_DIFAT_SLOTS}-sector single-header bound`);
@@ -103,8 +97,6 @@ export function writeCompoundFile(root) {
     }
     const fatStart = cursor;
     cursor += fatSectors;
-    const difatStart = difatSectors > 0 ? cursor : ENDOFCHAIN;
-    cursor += difatSectors;
     const totalSectors = cursor;
     rootEntry.startSector = miniStreamStart;
     rootEntry.size = miniLength;
@@ -122,8 +114,6 @@ export function writeCompoundFile(root) {
         chainRegion(big.entry.startSector, big.sectors);
     for (let k = 0; k < fatSectors; k++)
         fat[fatStart + k] = FATSECT;
-    for (let k = 0; k < difatSectors; k++)
-        fat[difatStart + k] = DIFSECT;
     const buf = new Uint8Array((totalSectors + 1) * SECTOR);
     const dv = new DataView(buf.buffer);
     const at = (sector) => (sector + 1) * SECTOR;
@@ -132,8 +122,6 @@ export function writeCompoundFile(root) {
         dirStart,
         miniFatStart,
         miniFatSectors,
-        difatStart,
-        difatSectors,
         fatStart,
     });
     for (const e of entries)
@@ -152,14 +140,6 @@ export function writeCompoundFile(root) {
         buf.set(big.data, at(big.entry.startSector));
     for (const [i, sector] of fat.entries())
         dv.setUint32(at(fatStart) + i * 4, sector, true);
-    for (let d = 0; d < difatSectors; d++) {
-        const base = at(difatStart + d);
-        for (let i = 0; i < FAT_ENTRIES_PER_SECTOR - 1; i++) {
-            const fatIdx = HEADER_DIFAT_SLOTS + d * (FAT_ENTRIES_PER_SECTOR - 1) + i;
-            dv.setUint32(base + i * 4, fatIdx < fatSectors ? fatStart + fatIdx : FREESECT, true);
-        }
-        dv.setUint32(base + (FAT_ENTRIES_PER_SECTOR - 1) * 4, d < difatSectors - 1 ? difatStart + d + 1 : ENDOFCHAIN, true);
-    }
     return buf;
 }
 function validateSiblingNames(storageName, siblings) {
@@ -170,10 +150,11 @@ function validateSiblingNames(storageName, siblings) {
         if (node.name.length > MAX_NAME_CHARS) {
             throw new VbaAuthorError(`entry name ${quoted(node.name)} exceeds the ${MAX_NAME_CHARS}-character CFB limit`);
         }
-        if (seen.has(node.name)) {
+        const key = entryNameKey(node.name);
+        if (seen.has(key)) {
             throw new VbaAuthorError(`duplicate entry name ${quoted(node.name)} under storage ${quoted(storageName)}`);
         }
-        seen.add(node.name);
+        seen.add(key);
         if (!isStream(node))
             validateSiblingNames(node.name, node.children);
     }
@@ -210,8 +191,8 @@ function writeHeader(dv, p) {
     dv.setUint32(HEADER_FIELD.miniStreamCutoff, MINI_STREAM_CUTOFF, true);
     dv.setUint32(HEADER_FIELD.firstMiniFatSector, p.miniFatStart, true);
     dv.setUint32(HEADER_FIELD.miniFatSectors, p.miniFatSectors, true);
-    dv.setUint32(HEADER_FIELD.firstDifatSector, p.difatSectors > 0 ? p.difatStart : ENDOFCHAIN, true);
-    dv.setUint32(HEADER_FIELD.difatSectors, p.difatSectors, true);
+    dv.setUint32(HEADER_FIELD.firstDifatSector, ENDOFCHAIN, true);
+    dv.setUint32(HEADER_FIELD.difatSectors, 0, true);
     for (let i = 0; i < HEADER_DIFAT_SLOTS; i++) {
         dv.setUint32(HEADER_FIELD.difat + i * 4, i < p.fatSectors ? p.fatStart + i : FREESECT, true);
     }

package/dist/vba/cfb.js

@@ -12,6 +12,8 @@ export class CompoundFile {
     #fat;
     #miniFat;
     #dir;
+    #rootIndex;
+    #root;
     #miniStream;
     constructor(buf) {
         this.#buf = buf;
@@ -44,15 +46,16 @@ export class CompoundFile {
         this.#fat = this.#readFat(fatSectorIds);
         this.#miniFat = this.#readChainValues(firstMiniFatSector);
         this.#dir = this.#readDirectory(firstDirSector);
-        const root = this.#dir.find((e) => e.type === TYPE_ROOT);
+        this.#rootIndex = this.#dir.findIndex((e) => e.type === TYPE_ROOT);
+        const root = this.#dir[this.#rootIndex];
         if (!root)
             throw new VbaParseError('compound file has no root storage entry');
+        this.#root = root;
         this.#miniStream = this.#readViaFat(root.startSector, root.size);
     }
     readStream(path) {
-        const rootIdx = this.#rootIndex();
-        const seen = new Set([rootIdx]);
-        let firstChild = this.#dir[rootIdx].child;
+        const seen = new Set([this.#rootIndex]);
+        let firstChild = this.#root.child;
         for (const [depth, segment] of path.entries()) {
             const stream = depth === path.length - 1;
             const entry = this.#childIndices(firstChild, seen, depth)
@@ -68,14 +71,7 @@ export class CompoundFile {
         return undefined;
     }
     tree() {
-        const rootIdx = this.#rootIndex();
-        return this.#buildSiblings(this.#dir[rootIdx].child, new Set([rootIdx]));
-    }
-    #rootIndex() {
-        const rootIdx = this.#dir.findIndex((e) => e.type === TYPE_ROOT);
-        if (rootIdx < 0)
-            throw new VbaParseError('compound file has no root storage entry');
-        return rootIdx;
+        return this.#buildSiblings(this.#root.child, new Set([this.#rootIndex]));
     }
     #buildSiblings(firstChild, seen, depth = 0) {
         if (depth > MAX_TREE_DEPTH)

package/dist/vba/project-editor.js

@@ -8,12 +8,12 @@ import { CompoundFile } from './cfb.js';
 import { decoderForCodePage, encoderForCodePage } from './codepage.js';
 import { dirRecord, dirRecords, REC_MODULE_NAME, REC_MODULE_STREAMNAME, REC_MODULE_TERMINATOR, REC_MODULES_COUNT, REC_REFERENCE_NAME, REC_REFERENCE_NAME_UNICODE, REC_REFERENCE_REGISTERED, } from './dir-records.js';
 import { VbaAuthorError, VbaParseError } from './errors.js';
-import { compressContainer, decompressContainer } from './ms-ovba.js';
+import { compressContainer } from './ms-ovba.js';
 import { DIR_PATH, parseVbaProjectIn, PROJECT_PATH, PROJECTWM_PATH, VBA_STORAGE } from './project.js';
 import { validateReferenceName } from './vba-encoding.js';
 export function removeVbaModule(bin, name) {
     const cfb = new CompoundFile(bin);
-    const project = parseVbaProjectIn(cfb);
+    const { project, dir } = parseVbaProjectIn(cfb);
     const nameKey = name.toUpperCase();
     const module = project.modules.find((m) => m.name.toUpperCase() === nameKey);
     if (!module)
@@ -23,10 +23,7 @@ export function removeVbaModule(bin, name) {
             'primitive cannot verify');
     }
     const decoder = decoderForCodePage(project.codePage);
-    const dirCompressed = cfb.readStream(DIR_PATH);
-    if (!dirCompressed)
-        throw new VbaParseError("VBA project has no 'dir' stream");
-    const patchedDir = removeModuleDirRecord(decompressContainer(dirCompressed), module.streamName, decoder);
+    const patchedDir = removeModuleDirRecord(dir, module.streamName, decoder);
     const replacements = [{ path: DIR_PATH, data: compressContainer(patchedDir) }];
     const projectText = cfb.readStream(PROJECT_PATH);
     if (projectText) {
@@ -90,12 +87,10 @@ function normalizeReference(ref) {
 export function addVbaReference(bin, ref) {
     const normalized = normalizeReference(ref);
     const cfb = new CompoundFile(bin);
-    const encode = encoderForCodePage(parseVbaProjectIn(cfb).codePage);
-    const dirCompressed = cfb.readStream(DIR_PATH);
-    if (!dirCompressed)
-        throw new VbaParseError("VBA project has no 'dir' stream");
+    const { project, dir } = parseVbaProjectIn(cfb);
+    const encode = encoderForCodePage(project.codePage);
     const records = buildReferenceDirRecords(normalized, encode);
-    const patchedDir = insertReferenceDirRecords(decompressContainer(dirCompressed), records);
+    const patchedDir = insertReferenceDirRecords(dir, records);
     return writeCompoundFile(replaceStreams(cfb.tree(), [{ path: DIR_PATH, data: compressContainer(patchedDir) }]));
 }
 function buildReferenceDirRecords(ref, encode) {

package/dist/vba/project.d.ts

@@ -54,6 +54,10 @@ export declare function parseVbaProject(bin: Uint8Array, maxOutput?: number): Vb
  * Both project editors parse fail-closed first and then need the container itself, and each was
  * building a second `CompoundFile` over the same bytes: a second walk of the DIFAT, FAT, mini-FAT,
  * directory and mini-stream, which is roughly double the cost and double the peak allocation of every
- * edit. Opening it once and handing it in is the whole of the fix.
+ * edit. Opening it once and handing it in is the whole of the fix. The decompressed `dir` stream comes
+ * back beside the project, so an editor patches the bytes the parse validated and budgeted.
  */
-export declare function parseVbaProjectIn(cfb: CompoundFile, maxOutput?: number): VbaProject;
+export declare function parseVbaProjectIn(cfb: CompoundFile, maxOutput?: number): {
+    project: VbaProject;
+    dir: Uint8Array;
+};

package/dist/vba/project.js

@@ -25,7 +25,7 @@ export const DIR_PATH = [VBA_STORAGE, 'dir'];
 export const PROJECT_PATH = ['PROJECT'];
 export const PROJECTWM_PATH = ['PROJECTwm'];
 export function parseVbaProject(bin, maxOutput = DEFAULT_MAX_PROJECT_OUTPUT) {
-    return parseVbaProjectIn(new CompoundFile(bin), maxOutput);
+    return parseVbaProjectIn(new CompoundFile(bin), maxOutput).project;
 }
 export function parseVbaProjectIn(cfb, maxOutput = DEFAULT_MAX_PROJECT_OUTPUT) {
     const budget = new DecompressionBudget(maxOutput);
@@ -80,7 +80,7 @@ export function parseVbaProjectIn(cfb, maxOutput = DEFAULT_MAX_PROJECT_OUTPUT) {
             source: readModuleSource(cfb, streamName, m.offset, decoder, budget),
         };
     });
-    return { codePage, modules };
+    return { project: { codePage, modules }, dir };
 }
 function readModuleSource(cfb, streamName, textOffset, decoder, budget) {
     const stream = cfb.readStream([VBA_STORAGE, streamName]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shbernal/ts-xlsx",
-  "version": "3.2.2-next.24.g38fae0e",
+  "version": "3.2.2-next.26.gf63f249",
   "description": "A TypeScript-first library for reading and writing xlsx (OOXML) spreadsheets.",
   "keywords": [
     "csv",