@cj-tech-master/excelts 4.2.3 → 5.0.0-canary.20260123012457.1fdf506

package/dist/cjs/modules/excel/xlsx/xform/sheet/worksheet-xform.js

@@ -191,6 +191,23 @@ class WorkSheetXform extends base_xform_1.BaseXform {
                 vmlDrawing: `vmlDrawing${model.id}`
             });
         }
+        // Handle pre-loaded drawing (from file read) that may contain charts or other non-image content
+        // This preserves drawings through round-trip even if they don't contain images
+        // Note: Always assign a new rId since rels are rebuilt during write
+        if (model.drawing && model.drawing.anchors) {
+            // This is a loaded drawing that needs to be added to relationships
+            const drawing = model.drawing;
+            drawing.rId = nextRid(rels);
+            if (!drawing.name) {
+                drawing.name = `drawing${++options.drawingsCount}`;
+            }
+            options.drawings.push(drawing);
+            rels.push({
+                Id: drawing.rId,
+                Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+                Target: (0, ooxml_paths_1.drawingRelTargetFromWorksheet)(drawing.name)
+            });
+        }
         const drawingRelsHash = [];
         let bookImage;
         model.media.forEach(medium => {
@@ -370,7 +387,8 @@ class WorkSheetXform extends base_xform_1.BaseXform {
                 defaultRowHeight: model.properties.defaultRowHeight,
                 dyDescent: model.properties.dyDescent,
                 outlineLevelCol: model.properties.outlineLevelCol,
-                outlineLevelRow: model.properties.outlineLevelRow
+                outlineLevelRow: model.properties.outlineLevelRow,
+                customHeight: model.properties.customHeight
             }
             : undefined;
         if (model.properties && model.properties.defaultColWidth) {
@@ -602,17 +620,27 @@ class WorkSheetXform extends base_xform_1.BaseXform {
             if (match) {
                 const drawingName = match[1];
                 const drawing = options.drawings[drawingName];
-                drawing.anchors.forEach(anchor => {
-                    if (anchor.medium) {
-                        const image = {
-                            type: "image",
-                            imageId: anchor.medium.index,
-                            range: anchor.range,
-                            hyperlinks: anchor.picture.hyperlinks
-                        };
-                        model.media.push(image);
-                    }
-                });
+                if (drawing) {
+                    // Preserve the drawing object for round-trip (charts, etc.)
+                    // This includes the name, anchors, and rels
+                    model.drawing = {
+                        ...drawing,
+                        name: drawingName,
+                        rels: options.drawingRels?.[drawingName] || drawing.rels || []
+                    };
+                    // Also extract images to model.media for backward compatibility
+                    drawing.anchors.forEach(anchor => {
+                        if (anchor.medium) {
+                            const image = {
+                                type: "image",
+                                imageId: anchor.medium.index,
+                                range: anchor.range,
+                                hyperlinks: anchor.picture.hyperlinks
+                            };
+                            model.media.push(image);
+                        }
+                    });
+                }
             }
         }
         const backgroundRel = model.background && rels[model.background.rId];

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

@@ -27,24 +27,27 @@ class StyleXform extends base_xform_1.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.
@@ -85,6 +88,23 @@ class StyleXform extends base_xform_1.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/cjs/modules/excel/xlsx/xform/style/styles-xform.js

@@ -87,6 +87,13 @@ class StylesXform extends base_xform_1.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;
         //
@@ -103,8 +110,8 @@ class StylesXform extends base_xform_1.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",
@@ -196,6 +203,10 @@ class StylesXform extends base_xform_1.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: [],
@@ -223,8 +234,14 @@ class StylesXform extends base_xform_1.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_1.Enums.ValueType.Number;
         // If we have seen this style object before, assume it has the same styleId.
@@ -265,6 +282,21 @@ class StylesXform extends base_xform_1.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_1.Enums.ValueType.Checkbox) {
             // Checkbox rendering relies on style extensions (extLst) and workbook-level parts.
             // Force applyAlignment="1" (without emitting an <alignment/> node) by providing
@@ -325,6 +357,22 @@ class StylesXform extends base_xform_1.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) {