xlsx-template-browser 0.3.0 → 0.3.1

package/README.md

@@ -148,6 +148,13 @@ To use the library, you need the code like this:
 
 ## Changelog History
 
+### Version 0.3.1
+
+* Bugfix in types
+* Proper extensions of rows and columns for tables, pivot tables, data validations,
+  and conitional formatting un case of multiple extensions
+* Proper handling of undefined ${table:} values
+
 ### Version 0.3.0
 
 * Performance is optimized

package/dist/index.cjs

@@ -580,6 +580,10 @@ var getReplacements = (oldValues, dataStore) => {
       }
       const isTable = typeof match.groups.table === "string";
       const value = dataStore.get(match.groups.accessor);
+      if (typeof value !== "object") {
+        replacements.set(String(index), "");
+        continue;
+      }
       const cloned = structuredClone(value);
       if (isTable) Object.defineProperty(cloned, "$isTable", { value: true, enumerable: false });
       replacements.set(String(index), cloned);
@@ -1222,13 +1226,23 @@ var getConditionalFormatting = (xml) => {
       rows: 0,
       cols: 0
     };
+    let columnExtension = 0;
+    let rowExtension = 0;
+    let currentRow = 0;
     const extend = (cell) => {
       if (Array.isArray(cell.newValue)) {
+        if (cell.row !== currentRow) {
+          currentRow = cell.row;
+          columnExtension = 0;
+          rowExtension = 0;
+        }
         const length = cell.newValue.length - 1;
         if ("$isTable" in cell.newValue) {
-          extension.rows = Math.max(length, extension.rows);
+          rowExtension = Math.max(length, rowExtension) - Math.min(length, rowExtension);
+          extension.rows = extension.rows + rowExtension;
         } else {
-          extension.cols = Math.max(length, extension.cols);
+          columnExtension = columnExtension + length;
+          extension.cols = Math.max(columnExtension, extension.cols);
         }
       }
     };
@@ -1314,6 +1328,9 @@ var getTables = async ({
         return h;
       });
     };
+    let columnExtension = 0;
+    let rowExtension = 0;
+    let currentRow = 0;
     const extend = (cell) => {
       const t = tables.get(file);
       if (t === void 0) return;
@@ -1329,11 +1346,18 @@ var getTables = async ({
         }
       }
       if (Array.isArray(cell.newValue)) {
+        if (cell.row !== currentRow) {
+          currentRow = cell.row;
+          columnExtension = 0;
+          rowExtension = 0;
+        }
         const length = cell.newValue.length - 1;
         if ("$isTable" in cell.newValue) {
-          t.extension.rows = t.extension.rows + length;
+          rowExtension = Math.max(length, rowExtension) - Math.min(length, rowExtension);
+          t.extension.rows = t.extension.rows + rowExtension;
         } else {
-          t.extension.cols = t.extension.cols + length;
+          columnExtension = columnExtension + length;
+          t.extension.cols = Math.max(columnExtension, t.extension.cols);
         }
       }
       t.isDirty = true;
@@ -1786,13 +1810,23 @@ var getPivotTables = async (xlsx) => {
       rows: 0,
       cols: 0
     };
+    let columnExtension = 0;
+    let rowExtension = 0;
+    let currentRow = 0;
     const extend = (cell) => {
       if (Array.isArray(cell.newValue)) {
+        if (cell.row !== currentRow) {
+          currentRow = cell.row;
+          columnExtension = 0;
+          rowExtension = 0;
+        }
         const length = cell.newValue.length - 1;
         if ("$isTable" in cell.newValue) {
-          extension.rows = Math.max(length, extension.rows);
+          rowExtension = Math.max(length, rowExtension) - Math.min(length, rowExtension);
+          extension.rows = extension.rows + rowExtension;
         } else {
-          extension.cols = Math.max(length, extension.cols);
+          columnExtension = columnExtension + length;
+          extension.cols = Math.max(columnExtension, extension.cols);
         }
       }
     };
@@ -1910,13 +1944,23 @@ var getDataValidations = (sheets) => {
           validation.listRange.range = parseCellRange(reference.ref);
         }
       }
+      let columnExtension = 0;
+      let rowExtension = 0;
+      let currentRow = 0;
       const extend = (cell) => {
         if (Array.isArray(cell.newValue)) {
+          if (cell.row !== currentRow) {
+            currentRow = cell.row;
+            columnExtension = 0;
+            rowExtension = 0;
+          }
           const length = cell.newValue.length - 1;
           if ("$isTable" in cell.newValue) {
-            extension.rows = Math.max(length, extension.rows);
+            rowExtension = Math.max(length, rowExtension) - Math.min(length, rowExtension);
+            extension.rows = extension.rows + rowExtension;
           } else {
-            extension.cols = Math.max(length, extension.cols);
+            columnExtension = columnExtension + length;
+            extension.cols = Math.max(columnExtension, extension.cols);
           }
         }
       };