exceljs-lts 4.5.0 → 4.5.1

package/lib/doc/table.js

@@ -1,6 +1,36 @@
 /* eslint-disable max-classes-per-file */
 const colCache = require('../utils/col-cache');
 
+// Excel's rules for table names: start with a letter, '_' or '\\', then letters, digits, '.' or
+// '_'; at most 255 characters; and the name must not be read as a cell reference.
+// Any non-ASCII character is treated as a letter so that names Excel accepts keep working.
+const tableNameRegex = /^[A-Za-z_\\\u0080-\uFFFF][A-Za-z0-9._\u0080-\uFFFF]*$/;
+
+function isCellReference(name) {
+  if (/^[RC]$/i.test(name) || /^R\d*C\d*$/i.test(name)) {
+    // 'R', 'C' and R1C1-style references such as 'R1C1' or 'RC'
+    return true;
+  }
+  const match = /^([A-Z]{1,3})(\d+)$/i.exec(name);
+  if (!match) {
+    return false;
+  }
+  // letters past XFD are not a column, so a name like 'ZZZ1' is fine
+  const letters = match[1].toUpperCase();
+  const isColumn = letters.length < 3 || letters <= 'XFD';
+  const row = parseInt(match[2], 10);
+  return isColumn && row >= 1 && row <= 1048576;
+}
+
+function isValidTableName(name) {
+  return (
+    typeof name === 'string' &&
+    name.length <= 255 &&
+    tableNameRegex.test(name) &&
+    !isCellReference(name)
+  );
+}
+
 class Column {
   // wrapper around column model, allowing access and manipulation
   constructor(table, column, index) {
@@ -149,6 +179,13 @@ class Table {
         throw new Error(message);
       }
     };
+    assert(table.name, 'Table must have a name');
+    assert(
+      isValidTableName(table.name),
+      `Invalid table name '${table.name}'. A table name must start with a letter, underscore ` +
+        'or backslash, contain only letters, digits, periods and underscores, ' +
+        'not look like a cell reference and be at most 255 characters long.'
+    );
     assert(table.ref, 'Table must have ref');
     assert(table.columns, 'Table must have column definitions');
     assert(table.rows, 'Table must have row definitions');

package/lib/doc/worksheet.js

@@ -271,6 +271,23 @@ class Worksheet {
   spliceColumns(start, count, ...inserts) {
     const rows = this._rows;
     const nRows = rows.length;
+
+    // unmerge any merges that touch the spliced or shifted columns so their cells move
+    // as plain cells; they are re-merged at their new position below
+    const merges = Object.values(this._merges).filter(merge => merge.right >= start);
+    merges.forEach(merge => {
+      for (let i = merge.top; i <= merge.bottom; i++) {
+        for (let j = merge.left; j <= merge.right; j++) {
+          // keep each cell's own style (e.g. borders) while unmerging
+          const cell = this.getCell(i, j);
+          const {style} = cell;
+          cell.unmerge();
+          cell.style = style;
+        }
+      }
+      delete this._merges[colCache.encodeAddress(merge.top, merge.left)];
+    });
+
     if (inserts.length > 0) {
       // must iterate over all rows whether they exist yet or not
       for (let i = 0; i < nRows; i++) {
@@ -309,6 +326,26 @@ class Worksheet {
       this.getColumn(i).defn = null;
     }
 
+    // re-merge the merges that were unmerged above, shifted, shrunk or grown to match.
+    // Inserted columns join a merge only when it continues on both sides of them.
+    merges.forEach(merge => {
+      let {left, right} = merge;
+      if (left >= nKeep) {
+        left += nExpand;
+      } else if (left >= start) {
+        left = start + inserts.length;
+      }
+      if (right >= nKeep) {
+        right += nExpand;
+      } else if (right >= start) {
+        right = start - 1;
+      }
+      // drop merges whose columns were all deleted or that are down to a single cell
+      if (left < right || (left === right && merge.top < merge.bottom)) {
+        this.mergeCellsWithoutStyle(merge.top, left, merge.bottom, right);
+      }
+    });
+
     // account for defined names
     this.workbook.definedNames.spliceColumns(this.name, start, count, inserts.length);
   }

package/lib/xlsx/xform/sheet/worksheet-xform.js

@@ -498,10 +498,10 @@ class WorkSheetXform extends BaseXform {
     model.media = [];
     if (model.drawing) {
       const drawingRel = rels[model.drawing.rId];
-      const match = drawingRel.Target.match(/\/drawings\/([a-zA-Z0-9]+)[.][a-zA-Z]{3,4}$/);
-      if (match) {
-        const drawingName = match[1];
-        const drawing = options.drawings[drawingName];
+      const match =
+        drawingRel && drawingRel.Target.match(/\/drawings\/([a-zA-Z0-9]+)[.][a-zA-Z]{3,4}$/);
+      const drawing = match && options.drawings[match[1]];
+      if (drawing) {
         drawing.anchors.forEach(anchor => {
           if (anchor.medium) {
             const image = {

package/lib/xlsx/xlsx.js

@@ -95,7 +95,7 @@ class XLSX {
     Object.keys(model.drawings).forEach(name => {
       const drawing = model.drawings[name];
       const drawingRel = model.drawingRels[name];
-      if (drawingRel) {
+      if (drawing && drawingRel) {
         drawingOptions.rels = drawingRel.reduce((o, rel) => {
           o[rel.Id] = rel;
           return o;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exceljs-lts",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Maintained fork of exceljs — drop-in replacement, fixes Excel \"We found a problem with some content\" repair prompts, the TypeError crash on rich-text shared strings, and lost formula results (0, false, ''). Read and write xlsx and csv files.",
   "private": false,
   "license": "MIT",