@cj-tech-master/excelts 5.0.0 → 5.0.1-canary.20260123024428.98c7ee0

package/dist/esm/modules/excel/xlsx/xform/style/style-xform.js

@@ -24,24 +24,27 @@ class StyleXform extends BaseXform {
         if (this.xfId) {
             xmlStream.addAttribute("xfId", model.xfId || 0);
         }
-        if (model.numFmtId) {
+        if (model.applyNumberFormat || model.numFmtId) {
             xmlStream.addAttribute("applyNumberFormat", "1");
         }
-        if (model.fontId) {
+        if (model.applyFont || model.fontId) {
             xmlStream.addAttribute("applyFont", "1");
         }
-        if (model.fillId) {
+        if (model.applyFill || model.fillId) {
             xmlStream.addAttribute("applyFill", "1");
         }
-        if (model.borderId) {
+        if (model.applyBorder || model.borderId) {
             xmlStream.addAttribute("applyBorder", "1");
         }
-        if (model.alignment) {
+        if (model.applyAlignment || model.alignment) {
             xmlStream.addAttribute("applyAlignment", "1");
         }
-        if (model.protection) {
+        if (model.applyProtection || model.protection) {
             xmlStream.addAttribute("applyProtection", "1");
         }
+        if (model.pivotButton) {
+            xmlStream.addAttribute("pivotButton", "1");
+        }
         /**
          * Rendering tags causes close of XML stream.
          * Therefore adding attributes must be done before rendering tags.
@@ -82,6 +85,23 @@ class StyleXform extends BaseXform {
                 if (this.xfId) {
                     this.model.xfId = parseInt(node.attributes.xfId, 10);
                 }
+                if (node.attributes.pivotButton === "1") {
+                    this.model.pivotButton = true;
+                }
+                // Preserve apply* flags from original file
+                const applyFlags = [
+                    "applyNumberFormat",
+                    "applyFont",
+                    "applyFill",
+                    "applyBorder",
+                    "applyAlignment",
+                    "applyProtection"
+                ];
+                for (const flag of applyFlags) {
+                    if (node.attributes[flag] === "1") {
+                        this.model[flag] = true;
+                    }
+                }
                 return true;
             case "alignment":
                 this.parser = this.map.alignment;

package/dist/esm/modules/excel/xlsx/xform/style/styles-xform.js

@@ -84,6 +84,13 @@ class StylesXform extends BaseXform {
         this.weakMap = new WeakMap();
         this._hasCheckboxes = false;
     }
+    /**
+     * Set the default font to use when no font is explicitly specified.
+     * This preserves the original file's default font during round-trip.
+     */
+    setDefaultFont(font) {
+        this.defaultFont = font;
+    }
     render(xmlStream, model) {
         const renderModel = model || this.model;
         //
@@ -100,8 +107,8 @@ class StylesXform extends BaseXform {
                 xmlStream.closeNode();
             }
             if (!renderModel.fonts.length) {
-                // default (zero) font
-                this._addFont({
+                // default (zero) font - use preserved font or fallback to Calibri
+                this._addFont(this.defaultFont || {
                     size: 11,
                     color: { theme: 1 },
                     name: "Calibri",
@@ -193,6 +200,10 @@ class StylesXform extends BaseXform {
                 add("borders", this.map.borders);
                 add("styles", this.map.cellXfs);
                 add("dxfs", this.map.dxfs);
+                // preserve the default (first) font from the original file
+                if (this.map.fonts.model && this.map.fonts.model.length > 0) {
+                    this.defaultFont = this.map.fonts.model[0];
+                }
                 // index numFmts
                 this.index = {
                     model: [],
@@ -220,8 +231,14 @@ class StylesXform extends BaseXform {
         }
         // if we have no default font, add it here now
         if (!this.model.fonts.length) {
-            // default (zero) font
-            this._addFont({ size: 11, color: { theme: 1 }, name: "Calibri", family: 2, scheme: "minor" });
+            // default (zero) font - use preserved font or fallback to Calibri
+            this._addFont(this.defaultFont || {
+                size: 11,
+                color: { theme: 1 },
+                name: "Calibri",
+                family: 2,
+                scheme: "minor"
+            });
         }
         const type = cellType || Enums.ValueType.Number;
         // If we have seen this style object before, assume it has the same styleId.
@@ -262,6 +279,21 @@ class StylesXform extends BaseXform {
         if (model.protection) {
             style.protection = model.protection;
         }
+        // Preserve xf-level attributes (pivotButton, apply* flags)
+        const xfFlags = [
+            "pivotButton",
+            "applyNumberFormat",
+            "applyFont",
+            "applyFill",
+            "applyBorder",
+            "applyAlignment",
+            "applyProtection"
+        ];
+        for (const flag of xfFlags) {
+            if (model[flag]) {
+                style[flag] = true;
+            }
+        }
         if (type === Enums.ValueType.Checkbox) {
             // Checkbox rendering relies on style extensions (extLst) and workbook-level parts.
             // Force applyAlignment="1" (without emitting an <alignment/> node) by providing
@@ -322,6 +354,22 @@ class StylesXform extends BaseXform {
         if (style.protection) {
             model.protection = style.protection;
         }
+        // -------------------------------------------------------
+        // xf-level attributes (pivotButton, apply* flags)
+        const xfFlags = [
+            "pivotButton",
+            "applyNumberFormat",
+            "applyFont",
+            "applyFill",
+            "applyBorder",
+            "applyAlignment",
+            "applyProtection"
+        ];
+        for (const flag of xfFlags) {
+            if (style[flag]) {
+                model[flag] = true;
+            }
+        }
         return model;
     }
     addDxfStyle(style) {

package/dist/esm/modules/excel/xlsx/xlsx.browser.js

@@ -600,6 +600,8 @@ class XLSX {
         delete model.sharedStrings;
         delete model.workbookRels;
         delete model.sheetDefs;
+        // Preserve default font before deleting styles
+        model.defaultFont = model.styles?.defaultFont;
         delete model.styles;
         delete model.mediaIndex;
         delete model.drawings;
@@ -759,16 +761,26 @@ class XLSX {
             });
         }
     }
-    async _processDrawingEntry(entry, model, name) {
-        // Collect raw data first so we can preserve drawings that reference charts.
-        const rawData = await this.collectStreamData(entry);
+    /**
+     * Process a drawing XML entry.
+     *
+     * @param stream - Stream to read from (used in loadFromZipEntries path)
+     * @param model - Model to populate
+     * @param name - Drawing name (e.g., "drawing1")
+     * @param rawData - Pre-read raw data (used in loadFromFiles path to avoid re-reading stream)
+     */
+    async _processDrawingEntry(stream, model, name, rawData) {
+        // Use provided rawData if available (loadFromFiles path), otherwise collect from stream.
+        // In loadFromFiles, the stream is created from already-decoded text, and collecting from
+        // it may not work correctly due to PassThrough stream timing issues.
+        const data = rawData ?? (await this.collectStreamData(stream));
         // Parse the drawing for normal processing (images, etc.)
         const xform = new DrawingXform();
-        const xmlString = this.bufferToString(rawData);
+        const xmlString = this.bufferToString(data);
         const drawing = await xform.parseStream(this.createTextStream(xmlString));
         model.drawings[name] = drawing;
         // Store raw data; reconcile() may later drop it if charts are not referenced.
-        model.rawDrawings[name] = rawData;
+        model.rawDrawings[name] = data;
     }
     async _processDrawingRelsEntry(entry, model, name) {
         const xform = new RelationshipsXform();
@@ -885,11 +897,8 @@ class XLSX {
         }
         const drawingName = getDrawingNameFromPath(entryName);
         if (drawingName) {
-            await this._processDrawingEntry(stream, model, drawingName);
-            // For loadFromFiles path, store raw data for passthrough (drawings with charts)
-            if (rawData) {
-                model.rawDrawings[drawingName] = rawData;
-            }
+            await this._processDrawingEntry(stream, model, drawingName, rawData);
+            // rawData is now stored inside _processDrawingEntry
             return true;
         }
         const drawingRelsName = getDrawingNameFromRelsPath(entryName);
@@ -1235,7 +1244,12 @@ class XLSX {
             options.useSharedStrings !== undefined ? options.useSharedStrings : true;
         model.useStyles = options.useStyles !== undefined ? options.useStyles : true;
         model.sharedStrings = new SharedStringsXform();
+        // Preserve default font from parsed styles if available
+        const oldDefaultFont = model.defaultFont;
         model.styles = model.useStyles ? new StylesXform(true) : new StylesXform.Mock();
+        if (oldDefaultFont && model.styles.setDefaultFont) {
+            model.styles.setDefaultFont(oldDefaultFont);
+        }
         const workbookXform = new WorkbookXform();
         const worksheetXform = new WorkSheetXform();
         workbookXform.prepare(model);