@odoo/o-spreadsheet 15.0.20 → 15.0.22

package/dist/o-spreadsheet.cjs.js

@@ -2975,7 +2975,7 @@ function deepEquals(o1, o2) {
     if (typeof o1 !== typeof o2)
         return false;
     if (typeof o1 !== "object")
-        return o1 === o2;
+        return false;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -16764,7 +16764,7 @@ class ClipboardPlugin extends UIPlugin {
         return 0 /* Success */;
     }
     handle(cmd) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         switch (cmd.type) {
             case "COPY":
             case "CUT":
@@ -16819,7 +16819,7 @@ class ClipboardPlugin extends UIPlugin {
             case "ADD_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.operation) !== "CUT") {
+                if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.operation) !== "CUT" || cmd.sheetId !== ((_b = this.state) === null || _b === void 0 ? void 0 : _b.sheetId)) {
                     return;
                 }
                 const isClipboardDirty = this.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -16831,7 +16831,7 @@ class ClipboardPlugin extends UIPlugin {
             case "REMOVE_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                if (((_b = this.state) === null || _b === void 0 ? void 0 : _b.operation) !== "CUT") {
+                if (((_c = this.state) === null || _c === void 0 ? void 0 : _c.operation) !== "CUT" || cmd.sheetId !== ((_d = this.state) === null || _d === void 0 ? void 0 : _d.sheetId)) {
                     return;
                 }
                 for (let el of cmd.elements) {
@@ -24307,10 +24307,6 @@ function extractStyle(cell, data) {
     if (cell.style) {
         style = data.styles[cell.style];
     }
-    let border = {};
-    if (cell.border) {
-        border = data.borders[cell.border];
-    }
     const styles = {
         font: {
             size: (style === null || style === void 0 ? void 0 : style.fontSize) || DEFAULT_FONT_SIZE,
@@ -24324,7 +24320,7 @@ function extractStyle(cell, data) {
             }
             : { reservedAttribute: "none" },
         numFmt: cell.format,
-        border: border || {},
+        border: cell.border || 0,
         verticalAlignment: "center",
         horizontalAlignment: style === null || style === void 0 ? void 0 : style.align,
     };
@@ -24335,21 +24331,17 @@ function extractStyle(cell, data) {
     return styles;
 }
 function normalizeStyle(construct, styles) {
-    const { id: fontId } = pushElement(styles["font"], construct.fonts);
-    const { id: fillId } = pushElement(styles["fill"], construct.fills);
-    const { id: borderId } = pushElement(styles["border"], construct.borders);
     // Normalize this
     const numFmtId = convertFormat(styles["numFmt"], construct.numFmts);
     const style = {
-        fontId,
-        fillId,
-        borderId,
+        fontId: pushElement(styles.font, construct.fonts),
+        fillId: pushElement(styles.fill, construct.fills),
+        borderId: styles.border,
         numFmtId,
         verticalAlignment: styles["verticalAlignment"],
         horizontalAlignment: styles["horizontalAlignment"],
     };
-    const { id } = pushElement(style, construct.styles);
-    return id;
+    return pushElement(style, construct.styles);
 }
 function convertFormat(format, numFmtStructure) {
     if (!format) {
@@ -24357,8 +24349,7 @@ function convertFormat(format, numFmtStructure) {
     }
     let formatId = XLSX_FORMAT_MAP[format];
     if (!formatId) {
-        const { id } = pushElement(format, numFmtStructure);
-        formatId = id + FIRST_NUMFMT_ID;
+        formatId = pushElement(format, numFmtStructure) + FIRST_NUMFMT_ID;
     }
     return formatId;
 }
@@ -24383,20 +24374,15 @@ function addRelsToFile(relsFiles, path, rel) {
     return id;
 }
 function pushElement(property, propertyList) {
-    for (let [key, value] of Object.entries(propertyList)) {
-        if (JSON.stringify(value) === JSON.stringify(property)) {
-            return { id: parseInt(key, 10), list: propertyList };
+    let len = propertyList.length;
+    const operator = typeof property === "object" ? deepEquals : (a, b) => a === b;
+    for (let i = 0; i < len; i++) {
+        if (operator(property, propertyList[i])) {
+            return i;
         }
     }
-    let elemId = propertyList.findIndex((elem) => JSON.stringify(elem) === JSON.stringify(property));
-    if (elemId === -1) {
-        propertyList.push(property);
-        elemId = propertyList.length - 1;
-    }
-    return {
-        id: elemId,
-        list: propertyList,
-    };
+    propertyList[propertyList.length] = property;
+    return propertyList.length - 1;
 }
 const chartIds = [];
 /**
@@ -24477,7 +24463,8 @@ function parseXML(xmlString) {
     }
     return document;
 }
-function getDefaultXLSXStructure() {
+function getDefaultXLSXStructure(data) {
+    const borders = [{}, ...Object.values(data.borders)];
     return {
         relsFiles: [],
         sharedStrings: [],
@@ -24500,7 +24487,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -24927,8 +24914,7 @@ function addContent(content, sharedStrings) {
         attrs.push(["t", "b"]);
     }
     else if (!isNumber(value)) {
-        const { id } = pushElement(content, sharedStrings);
-        value = id.toString();
+        value = pushElement(content, sharedStrings);
         attrs.push(["t", "s"]);
     }
     return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -25053,8 +25039,7 @@ function addCellIsRule(cf, rule, dxfs) {
     if (rule.style.fillColor) {
         dxf.fill = { fgColor: rule.style.fillColor };
     }
-    const { id } = pushElement(dxf, dxfs);
-    ruleAttributes.push(["dxfId", id]);
+    ruleAttributes.push(["dxfId", pushElement(dxf, dxfs)]);
     return escapeXml /*xml*/ `
     <conditionalFormatting sqref="${cf.ranges.join(" ")}">
       <cfRule ${formatAttributes(ruleAttributes)}>
@@ -25663,7 +25648,7 @@ function addMerges(merges) {
  */
 function getXLSX(data) {
     const files = [];
-    const construct = getDefaultXLSXStructure();
+    const construct = getDefaultXLSXStructure(data);
     files.push(createWorkbook(data, construct));
     files.push(...createWorksheets(data, construct));
     files.push(createStylesSheet(construct));
@@ -31538,6 +31523,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.0.20';
-__info__.date = '2024-04-05T13:56:04.792Z';
-__info__.hash = '09e95ef';
+__info__.version = '15.0.22';
+__info__.date = '2024-05-15T09:09:48.401Z';
+__info__.hash = '431bca3';

package/dist/o-spreadsheet.esm.js

@@ -2952,7 +2952,7 @@ function deepEquals(o1, o2) {
     if (typeof o1 !== typeof o2)
         return false;
     if (typeof o1 !== "object")
-        return o1 === o2;
+        return false;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -16741,7 +16741,7 @@ class ClipboardPlugin extends UIPlugin {
         return 0 /* Success */;
     }
     handle(cmd) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         switch (cmd.type) {
             case "COPY":
             case "CUT":
@@ -16796,7 +16796,7 @@ class ClipboardPlugin extends UIPlugin {
             case "ADD_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.operation) !== "CUT") {
+                if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.operation) !== "CUT" || cmd.sheetId !== ((_b = this.state) === null || _b === void 0 ? void 0 : _b.sheetId)) {
                     return;
                 }
                 const isClipboardDirty = this.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -16808,7 +16808,7 @@ class ClipboardPlugin extends UIPlugin {
             case "REMOVE_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                if (((_b = this.state) === null || _b === void 0 ? void 0 : _b.operation) !== "CUT") {
+                if (((_c = this.state) === null || _c === void 0 ? void 0 : _c.operation) !== "CUT" || cmd.sheetId !== ((_d = this.state) === null || _d === void 0 ? void 0 : _d.sheetId)) {
                     return;
                 }
                 for (let el of cmd.elements) {
@@ -24284,10 +24284,6 @@ function extractStyle(cell, data) {
     if (cell.style) {
         style = data.styles[cell.style];
     }
-    let border = {};
-    if (cell.border) {
-        border = data.borders[cell.border];
-    }
     const styles = {
         font: {
             size: (style === null || style === void 0 ? void 0 : style.fontSize) || DEFAULT_FONT_SIZE,
@@ -24301,7 +24297,7 @@ function extractStyle(cell, data) {
             }
             : { reservedAttribute: "none" },
         numFmt: cell.format,
-        border: border || {},
+        border: cell.border || 0,
         verticalAlignment: "center",
         horizontalAlignment: style === null || style === void 0 ? void 0 : style.align,
     };
@@ -24312,21 +24308,17 @@ function extractStyle(cell, data) {
     return styles;
 }
 function normalizeStyle(construct, styles) {
-    const { id: fontId } = pushElement(styles["font"], construct.fonts);
-    const { id: fillId } = pushElement(styles["fill"], construct.fills);
-    const { id: borderId } = pushElement(styles["border"], construct.borders);
     // Normalize this
     const numFmtId = convertFormat(styles["numFmt"], construct.numFmts);
     const style = {
-        fontId,
-        fillId,
-        borderId,
+        fontId: pushElement(styles.font, construct.fonts),
+        fillId: pushElement(styles.fill, construct.fills),
+        borderId: styles.border,
         numFmtId,
         verticalAlignment: styles["verticalAlignment"],
         horizontalAlignment: styles["horizontalAlignment"],
     };
-    const { id } = pushElement(style, construct.styles);
-    return id;
+    return pushElement(style, construct.styles);
 }
 function convertFormat(format, numFmtStructure) {
     if (!format) {
@@ -24334,8 +24326,7 @@ function convertFormat(format, numFmtStructure) {
     }
     let formatId = XLSX_FORMAT_MAP[format];
     if (!formatId) {
-        const { id } = pushElement(format, numFmtStructure);
-        formatId = id + FIRST_NUMFMT_ID;
+        formatId = pushElement(format, numFmtStructure) + FIRST_NUMFMT_ID;
     }
     return formatId;
 }
@@ -24360,20 +24351,15 @@ function addRelsToFile(relsFiles, path, rel) {
     return id;
 }
 function pushElement(property, propertyList) {
-    for (let [key, value] of Object.entries(propertyList)) {
-        if (JSON.stringify(value) === JSON.stringify(property)) {
-            return { id: parseInt(key, 10), list: propertyList };
+    let len = propertyList.length;
+    const operator = typeof property === "object" ? deepEquals : (a, b) => a === b;
+    for (let i = 0; i < len; i++) {
+        if (operator(property, propertyList[i])) {
+            return i;
         }
     }
-    let elemId = propertyList.findIndex((elem) => JSON.stringify(elem) === JSON.stringify(property));
-    if (elemId === -1) {
-        propertyList.push(property);
-        elemId = propertyList.length - 1;
-    }
-    return {
-        id: elemId,
-        list: propertyList,
-    };
+    propertyList[propertyList.length] = property;
+    return propertyList.length - 1;
 }
 const chartIds = [];
 /**
@@ -24454,7 +24440,8 @@ function parseXML(xmlString) {
     }
     return document;
 }
-function getDefaultXLSXStructure() {
+function getDefaultXLSXStructure(data) {
+    const borders = [{}, ...Object.values(data.borders)];
     return {
         relsFiles: [],
         sharedStrings: [],
@@ -24477,7 +24464,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -24904,8 +24891,7 @@ function addContent(content, sharedStrings) {
         attrs.push(["t", "b"]);
     }
     else if (!isNumber(value)) {
-        const { id } = pushElement(content, sharedStrings);
-        value = id.toString();
+        value = pushElement(content, sharedStrings);
         attrs.push(["t", "s"]);
     }
     return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -25030,8 +25016,7 @@ function addCellIsRule(cf, rule, dxfs) {
     if (rule.style.fillColor) {
         dxf.fill = { fgColor: rule.style.fillColor };
     }
-    const { id } = pushElement(dxf, dxfs);
-    ruleAttributes.push(["dxfId", id]);
+    ruleAttributes.push(["dxfId", pushElement(dxf, dxfs)]);
     return escapeXml /*xml*/ `
     <conditionalFormatting sqref="${cf.ranges.join(" ")}">
       <cfRule ${formatAttributes(ruleAttributes)}>
@@ -25640,7 +25625,7 @@ function addMerges(merges) {
  */
 function getXLSX(data) {
     const files = [];
-    const construct = getDefaultXLSXStructure();
+    const construct = getDefaultXLSXStructure(data);
     files.push(createWorkbook(data, construct));
     files.push(...createWorksheets(data, construct));
     files.push(createStylesSheet(construct));
@@ -31493,6 +31478,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, normalize, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.0.20';
-__info__.date = '2024-04-05T13:56:04.792Z';
-__info__.hash = '09e95ef';
+__info__.version = '15.0.22';
+__info__.date = '2024-05-15T09:09:48.401Z';
+__info__.hash = '431bca3';

package/dist/o-spreadsheet.iife.js

@@ -2972,7 +2972,7 @@
       if (typeof o1 !== typeof o2)
           return false;
       if (typeof o1 !== "object")
-          return o1 === o2;
+          return false;
       // Objects can have different keys if the values are undefined
       const keys = new Set();
       Object.keys(o1).forEach((key) => keys.add(key));
@@ -16761,7 +16761,7 @@
           return 0 /* Success */;
       }
       handle(cmd) {
-          var _a, _b;
+          var _a, _b, _c, _d;
           switch (cmd.type) {
               case "COPY":
               case "CUT":
@@ -16816,7 +16816,7 @@
               case "ADD_COLUMNS_ROWS": {
                   this.status = "invisible";
                   // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                  if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.operation) !== "CUT") {
+                  if (((_a = this.state) === null || _a === void 0 ? void 0 : _a.operation) !== "CUT" || cmd.sheetId !== ((_b = this.state) === null || _b === void 0 ? void 0 : _b.sheetId)) {
                       return;
                   }
                   const isClipboardDirty = this.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -16828,7 +16828,7 @@
               case "REMOVE_COLUMNS_ROWS": {
                   this.status = "invisible";
                   // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                  if (((_b = this.state) === null || _b === void 0 ? void 0 : _b.operation) !== "CUT") {
+                  if (((_c = this.state) === null || _c === void 0 ? void 0 : _c.operation) !== "CUT" || cmd.sheetId !== ((_d = this.state) === null || _d === void 0 ? void 0 : _d.sheetId)) {
                       return;
                   }
                   for (let el of cmd.elements) {
@@ -24304,10 +24304,6 @@
       if (cell.style) {
           style = data.styles[cell.style];
       }
-      let border = {};
-      if (cell.border) {
-          border = data.borders[cell.border];
-      }
       const styles = {
           font: {
               size: (style === null || style === void 0 ? void 0 : style.fontSize) || DEFAULT_FONT_SIZE,
@@ -24321,7 +24317,7 @@
               }
               : { reservedAttribute: "none" },
           numFmt: cell.format,
-          border: border || {},
+          border: cell.border || 0,
           verticalAlignment: "center",
           horizontalAlignment: style === null || style === void 0 ? void 0 : style.align,
       };
@@ -24332,21 +24328,17 @@
       return styles;
   }
   function normalizeStyle(construct, styles) {
-      const { id: fontId } = pushElement(styles["font"], construct.fonts);
-      const { id: fillId } = pushElement(styles["fill"], construct.fills);
-      const { id: borderId } = pushElement(styles["border"], construct.borders);
       // Normalize this
       const numFmtId = convertFormat(styles["numFmt"], construct.numFmts);
       const style = {
-          fontId,
-          fillId,
-          borderId,
+          fontId: pushElement(styles.font, construct.fonts),
+          fillId: pushElement(styles.fill, construct.fills),
+          borderId: styles.border,
           numFmtId,
           verticalAlignment: styles["verticalAlignment"],
           horizontalAlignment: styles["horizontalAlignment"],
       };
-      const { id } = pushElement(style, construct.styles);
-      return id;
+      return pushElement(style, construct.styles);
   }
   function convertFormat(format, numFmtStructure) {
       if (!format) {
@@ -24354,8 +24346,7 @@
       }
       let formatId = XLSX_FORMAT_MAP[format];
       if (!formatId) {
-          const { id } = pushElement(format, numFmtStructure);
-          formatId = id + FIRST_NUMFMT_ID;
+          formatId = pushElement(format, numFmtStructure) + FIRST_NUMFMT_ID;
       }
       return formatId;
   }
@@ -24380,20 +24371,15 @@
       return id;
   }
   function pushElement(property, propertyList) {
-      for (let [key, value] of Object.entries(propertyList)) {
-          if (JSON.stringify(value) === JSON.stringify(property)) {
-              return { id: parseInt(key, 10), list: propertyList };
+      let len = propertyList.length;
+      const operator = typeof property === "object" ? deepEquals : (a, b) => a === b;
+      for (let i = 0; i < len; i++) {
+          if (operator(property, propertyList[i])) {
+              return i;
           }
       }
-      let elemId = propertyList.findIndex((elem) => JSON.stringify(elem) === JSON.stringify(property));
-      if (elemId === -1) {
-          propertyList.push(property);
-          elemId = propertyList.length - 1;
-      }
-      return {
-          id: elemId,
-          list: propertyList,
-      };
+      propertyList[propertyList.length] = property;
+      return propertyList.length - 1;
   }
   const chartIds = [];
   /**
@@ -24474,7 +24460,8 @@
       }
       return document;
   }
-  function getDefaultXLSXStructure() {
+  function getDefaultXLSXStructure(data) {
+      const borders = [{}, ...Object.values(data.borders)];
       return {
           relsFiles: [],
           sharedStrings: [],
@@ -24497,7 +24484,7 @@
               },
           ],
           fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-          borders: [{}],
+          borders,
           numFmts: [],
           dxfs: [],
       };
@@ -24924,8 +24911,7 @@
           attrs.push(["t", "b"]);
       }
       else if (!isNumber(value)) {
-          const { id } = pushElement(content, sharedStrings);
-          value = id.toString();
+          value = pushElement(content, sharedStrings);
           attrs.push(["t", "s"]);
       }
       return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -25050,8 +25036,7 @@
       if (rule.style.fillColor) {
           dxf.fill = { fgColor: rule.style.fillColor };
       }
-      const { id } = pushElement(dxf, dxfs);
-      ruleAttributes.push(["dxfId", id]);
+      ruleAttributes.push(["dxfId", pushElement(dxf, dxfs)]);
       return escapeXml /*xml*/ `
     <conditionalFormatting sqref="${cf.ranges.join(" ")}">
       <cfRule ${formatAttributes(ruleAttributes)}>
@@ -25660,7 +25645,7 @@
    */
   function getXLSX(data) {
       const files = [];
-      const construct = getDefaultXLSXStructure();
+      const construct = getDefaultXLSXStructure(data);
       files.push(createWorkbook(data, construct));
       files.push(...createWorksheets(data, construct));
       files.push(createStylesSheet(construct));
@@ -31537,9 +31522,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.0.20';
-  __info__.date = '2024-04-05T13:56:04.792Z';
-  __info__.hash = '09e95ef';
+  __info__.version = '15.0.22';
+  __info__.date = '2024-05-15T09:09:48.401Z';
+  __info__.hash = '431bca3';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);