@justybase/spreadsheet-tasks 3.0.0 → 3.1.0

package/dist/esm/index.js

@@ -248,6 +248,16 @@ function defaultColWidth(width, floor = false) {
   }
   return 10;
 }
+function cellRefAttr(col, prevCol, colRef, rowNum) {
+  return col === prevCol + 1 ? "" : ` r="${colRef}${rowNum}"`;
+}
+var DEFAULT_COMPRESSION_LEVEL = 6;
+function assertCompressionLevel(level) {
+  if (!Number.isInteger(level) || level < 0 || level > 9) {
+    throw new RangeError(`compressionLevel must be an integer from 0 to 9, got ${level}`);
+  }
+  return level;
+}
 
 // src/ExcelReaderAbstract.ts
 var ExcelReaderAbstract = class {
@@ -545,10 +555,10 @@ function stripInvalidControlChars(str) {
   return out;
 }
 function escapeXmlText(str) {
-  if (!/&|<|>|"|'/.test(str) && !hasInvalidControlChars(str)) {
+  if (!/[&<>"'\r]/.test(str) && !hasInvalidControlChars(str)) {
     return str;
   }
-  let out = str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+  let out = str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;").replace(/\r/g, "&#13;");
   if (hasInvalidControlChars(out)) {
     out = stripInvalidControlChars(out);
   }
@@ -585,6 +595,14 @@ function unescapeXml(str) {
     }
   });
 }
+function escapeXlsxText(str) {
+  return escapeXmlText(str.replace(/_x([0-9A-Fa-f]{4})_/g, "_x005F_x$1_"));
+}
+function unescapeXmlText(str) {
+  if (!str) return str;
+  const text = unescapeXml(str.indexOf("\r") === -1 ? str : str.replace(/\r\n?/g, "\n"));
+  return text.indexOf("_x") === -1 ? text : text.replace(/_x([0-9A-Fa-f]{4})_/g, (_match, hex) => String.fromCharCode(parseInt(hex, 16)));
+}
 function parseTagAttributes(tag) {
   const attrs = {};
   const re = /([A-Za-z_][\w.:-]*)\s*=\s*("([^"]*)"|'([^']*)')/g;
@@ -651,7 +669,7 @@ function parseSharedStringsXml(xml) {
     while ((textMatch = textRegex.exec(content)) !== null) {
       value += textMatch[1];
     }
-    result.push(unescapeXml(value));
+    result.push(unescapeXmlText(value));
   }
   return result;
 }
@@ -1336,7 +1354,7 @@ var XlsxReader = class extends ExcelReaderAbstract {
       }
       let finalVal = null;
       if (inlineVals !== null) {
-        finalVal = unescapeXml(inlineVals.join(""));
+        finalVal = unescapeXmlText(inlineVals.join(""));
       } else if (val !== null) {
         if (type === "s") {
           const idx = parseInt(val, 10);
@@ -1344,13 +1362,13 @@ var XlsxReader = class extends ExcelReaderAbstract {
         } else if (type === "b") {
           finalVal = val === "1" || val === "true";
         } else if (type === "inlineStr") {
-          finalVal = unescapeXml(val);
+          finalVal = unescapeXmlText(val);
         } else if (type === "str") {
-          finalVal = unescapeXml(val);
+          finalVal = unescapeXmlText(val);
         } else if (type === "e") {
           finalVal = unescapeXml(val);
         } else if (type === "d") {
-          finalVal = parseIsoDateUtc(val) ?? unescapeXml(val);
+          finalVal = parseIsoDateUtc(val) ?? unescapeXmlText(val);
         } else if (type === "n" || type === "") {
           finalVal = parseFloat(val);
           if (styleIndex > 0 && this.xfIdToNumFmtId) {
@@ -1457,7 +1475,11 @@ var XlsbWriter = class _XlsbWriter {
   /**
    * @param filePath Destination `.xlsb` path on disk.
    */
-  constructor(filePath) {
+  /**
+   * @param filePath Destination `.xlsb` path on disk.
+   * @param options.compressionLevel Deflate level 0-9 (default 6).
+   */
+  constructor(filePath, options = {}) {
     this._outputError = null;
     this._finalized = false;
     this.sheetCount = 0;
@@ -1470,6 +1492,7 @@ var XlsbWriter = class _XlsbWriter {
     this._nextXfIdx = 4;
     this._stFmtRecords = /* @__PURE__ */ new Map();
     this.stream = new StreamingSheetState();
+    const compressionLevel = assertCompressionLevel(options.compressionLevel ?? DEFAULT_COMPRESSION_LEVEL);
     this._targetPath = path2.resolve(filePath);
     fs.mkdirSync(path2.dirname(this._targetPath), { recursive: true });
     this._tempPath = path2.join(
@@ -1480,7 +1503,7 @@ var XlsbWriter = class _XlsbWriter {
     this.output.on("error", (err) => {
       this._outputError = err;
     });
-    this.archive = archiver("zip");
+    this.archive = archiver("zip", { zlib: { level: compressionLevel } });
     this.archive.on("error", (err) => {
       this._outputError = err;
     });
@@ -3930,7 +3953,11 @@ var XlsxWriter = class {
   /**
    * @param filePath Destination `.xlsx` path on disk.
    */
-  constructor(filePath) {
+  /**
+   * @param filePath Destination `.xlsx` path on disk.
+   * @param options.compressionLevel Deflate level 0-9 (default 6).
+   */
+  constructor(filePath, options = {}) {
     this._outputError = null;
     this._finalized = false;
     this.sheetCount = 0;
@@ -3946,6 +3973,7 @@ var XlsxWriter = class {
     this._nextXfIndex = 4;
     this.stream = new StreamingSheetState();
     this.currentColLetters = [];
+    const compressionLevel = assertCompressionLevel(options.compressionLevel ?? DEFAULT_COMPRESSION_LEVEL);
     this._targetPath = path3.resolve(filePath);
     fs2.mkdirSync(path3.dirname(this._targetPath), { recursive: true });
     this._tempPath = path3.join(
@@ -3956,7 +3984,7 @@ var XlsxWriter = class {
     this.output.on("error", (err) => {
       this._outputError = err;
     });
-    this.archive = archiver2("zip");
+    this.archive = archiver2("zip", { zlib: { level: compressionLevel } });
     this.archive.on("error", (err) => {
       this._outputError = err;
     });
@@ -4001,7 +4029,7 @@ var XlsxWriter = class {
   _needsEscape(str) {
     for (let i = 0; i < str.length; i++) {
       const c = str.charCodeAt(i);
-      if (c === 38 || c === 60 || c === 62 || c === 34 || c === 39 || c >= 0 && c <= 8 || c === 11 || c === 12 || c >= 14 && c <= 31) {
+      if (c === 38 || c === 60 || c === 62 || c === 34 || c === 39 || c === 13 || c >= 0 && c <= 8 || c === 11 || c === 12 || c >= 14 && c <= 31) {
         return true;
       }
     }
@@ -4009,8 +4037,9 @@ var XlsxWriter = class {
   }
   _escape(str) {
     if (typeof str !== "string") return str;
+    str = str.replace(/_x([0-9A-Fa-f]{4})_/g, "_x005F_x$1_");
     if (!this._needsEscape(str)) return str;
-    return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;").replace(/[\x00-\x08\x0b\x0c\x0e-\x1f]/g, "");
+    return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;").replace(/\r/g, "&#13;").replace(/[\x00-\x08\x0b\x0c\x0e-\x1f]/g, "");
   }
   /**
    * Start streaming a sheet. Call `writeRow` for each row, then `endSheet`.
@@ -4063,7 +4092,7 @@ var XlsxWriter = class {
       this.stream.rowNum++;
       bigBuf.writeString(`<row r="${this.stream.rowNum}">`);
       for (let c = 0; c < headers.length; c++) {
-        this._writeStringCell(bigBuf, headers[c], colLetters[c], this.stream.rowNum, 3);
+        this._writeStringCell(bigBuf, headers[c], "", 3);
       }
       bigBuf.writeString("</row>");
     }
@@ -4079,6 +4108,7 @@ var XlsxWriter = class {
     this.stream.rowNum++;
     assertRowCount(this.stream.rowNum);
     bigBuf.writeString(`<row r="${this.stream.rowNum}">`);
+    let prevCol = -1;
     for (let c = 0; c < row.length; c++) {
       const raw = row[c];
       if (raw === null || raw === void 0) continue;
@@ -4086,27 +4116,28 @@ var XlsxWriter = class {
       const val = fmtString !== null ? unwrapCell(raw) : raw;
       const xfIdx = fmtString !== null ? this._registerFormat(fmtString) : -1;
       const styleAttr = xfIdx >= 0 ? ` s="${xfIdx}"` : "";
-      const colRef = this.currentColLetters[c];
+      const ref = cellRefAttr(c, prevCol, this.currentColLetters[c], this.stream.rowNum);
+      prevCol = c;
       if (typeof val === "number") {
         if (Number.isFinite(val)) {
-          bigBuf.writeString(`<c r="${colRef}${this.stream.rowNum}"${styleAttr}><v>${val}</v></c>`);
+          bigBuf.writeString(`<c${ref}${styleAttr}><v>${val}</v></c>`);
         } else {
-          this._writeStringCell(bigBuf, val.toString(), colRef, this.stream.rowNum, xfIdx >= 0 ? xfIdx : void 0);
+          this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
         }
       } else if (typeof val === "bigint") {
-        this._writeStringCell(bigBuf, val.toString(), colRef, this.stream.rowNum, xfIdx >= 0 ? xfIdx : void 0);
+        this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
       } else if (typeof val === "boolean") {
-        bigBuf.writeString(`<c r="${colRef}${this.stream.rowNum}" t="b"${styleAttr}><v>${val ? 1 : 0}</v></c>`);
+        bigBuf.writeString(`<c${ref} t="b"${styleAttr}><v>${val ? 1 : 0}</v></c>`);
       } else if (val instanceof Date) {
         const oaDate = this._toOADate(val);
         if (Number.isFinite(oaDate)) {
           const finalStyle = xfIdx >= 0 ? xfIdx : 1;
-          bigBuf.writeString(`<c r="${colRef}${this.stream.rowNum}" s="${finalStyle}"><v>${oaDate}</v></c>`);
+          bigBuf.writeString(`<c${ref} s="${finalStyle}"><v>${oaDate}</v></c>`);
         } else {
-          this._writeStringCell(bigBuf, val.toString(), colRef, this.stream.rowNum, xfIdx >= 0 ? xfIdx : void 0);
+          this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
         }
       } else if (val !== null && val !== void 0) {
-        this._writeStringCell(bigBuf, val.toString(), colRef, this.stream.rowNum, xfIdx >= 0 ? xfIdx : void 0);
+        this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
       }
     }
     bigBuf.writeString("</row>");
@@ -4192,7 +4223,7 @@ var XlsxWriter = class {
       rowNum++;
       bigBuf.writeString(`<row r="${rowNum}">`);
       for (let c = 0; c < headers.length; c++) {
-        this._writeStringCell(bigBuf, headers[c], colLetters[c], rowNum, 3);
+        this._writeStringCell(bigBuf, headers[c], "", 3);
       }
       bigBuf.writeString("</row>");
     }
@@ -4200,6 +4231,7 @@ var XlsxWriter = class {
       rowNum++;
       bigBuf.writeString(`<row r="${rowNum}">`);
       const row = rows[r];
+      let prevCol = -1;
       for (let c = 0; c < row.length; c++) {
         const raw = row[c];
         if (raw === null || raw === void 0) continue;
@@ -4207,27 +4239,28 @@ var XlsxWriter = class {
         const val = fmtString !== null ? unwrapCell(raw) : raw;
         const xfIdx = fmtString !== null ? this._registerFormat(fmtString) : -1;
         const styleAttr = xfIdx >= 0 ? ` s="${xfIdx}"` : "";
-        const colRef = colLetters[c];
+        const ref = cellRefAttr(c, prevCol, colLetters[c], rowNum);
+        prevCol = c;
         if (typeof val === "number") {
           if (Number.isFinite(val)) {
-            bigBuf.writeString(`<c r="${colRef}${rowNum}"${styleAttr}><v>${val}</v></c>`);
+            bigBuf.writeString(`<c${ref}${styleAttr}><v>${val}</v></c>`);
           } else {
-            this._writeStringCell(bigBuf, val.toString(), colRef, rowNum, xfIdx >= 0 ? xfIdx : void 0);
+            this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
           }
         } else if (typeof val === "bigint") {
-          this._writeStringCell(bigBuf, val.toString(), colRef, rowNum, xfIdx >= 0 ? xfIdx : void 0);
+          this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
         } else if (typeof val === "boolean") {
-          bigBuf.writeString(`<c r="${colRef}${rowNum}" t="b"${styleAttr}><v>${val ? 1 : 0}</v></c>`);
+          bigBuf.writeString(`<c${ref} t="b"${styleAttr}><v>${val ? 1 : 0}</v></c>`);
         } else if (val instanceof Date) {
           const oaDate = this._toOADate(val);
           if (Number.isFinite(oaDate)) {
             const finalStyle = xfIdx >= 0 ? xfIdx : 1;
-            bigBuf.writeString(`<c r="${colRef}${rowNum}" s="${finalStyle}"><v>${oaDate}</v></c>`);
+            bigBuf.writeString(`<c${ref} s="${finalStyle}"><v>${oaDate}</v></c>`);
           } else {
-            this._writeStringCell(bigBuf, val.toString(), colRef, rowNum, xfIdx >= 0 ? xfIdx : void 0);
+            this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
           }
         } else if (val !== null && val !== void 0) {
-          this._writeStringCell(bigBuf, val.toString(), colRef, rowNum, xfIdx >= 0 ? xfIdx : void 0);
+          this._writeStringCell(bigBuf, val.toString(), ref, xfIdx >= 0 ? xfIdx : void 0);
         }
       }
       bigBuf.writeString("</row>");
@@ -4246,7 +4279,8 @@ var XlsxWriter = class {
       name: this.sheetList[this.sheetCount - 1].pathInArchive
     });
   }
-  _writeStringCell(bigBuf, val, colRef, rowNum, styleOverride) {
+  /** `ref` is the cell's `r` attribute from `cellRefAttr`, or '' when omitted. */
+  _writeStringCell(bigBuf, val, ref, styleOverride) {
     assertCellTextLength(val);
     let index = this.sstMap.get(val);
     if (index === void 0) {
@@ -4256,7 +4290,7 @@ var XlsxWriter = class {
     }
     this.sstCntAll++;
     const styleAttr = styleOverride !== void 0 ? ` s="${styleOverride}"` : "";
-    bigBuf.writeString(`<c r="${colRef}${rowNum}" t="s"${styleAttr}><v>${index}</v></c>`);
+    bigBuf.writeString(`<c${ref} t="s"${styleAttr}><v>${index}</v></c>`);
   }
   _registerFormat(fmtString) {
     if (this._formatXfMap.has(fmtString)) {
@@ -4664,7 +4698,7 @@ async function writeAdmZipStreaming(zip, stagedParts, destinationPath) {
       } catch {
       }
     });
-    archive = archiver3("zip");
+    archive = archiver3("zip", { zlib: { level: DEFAULT_COMPRESSION_LEVEL } });
     archive.on("error", (err) => {
       outputError = err;
     });
@@ -5173,7 +5207,7 @@ var XlsxUpdater = class _XlsxUpdater {
       throw new Error("XlsxUpdater: sharedStrings.xml has no closing sst element.");
     }
     const appended = this.sharedStringsPending.map((txt) => {
-      const clean = escapeXmlText(txt);
+      const clean = escapeXlsxText(txt);
       const preserve = clean.length > 0 && (clean[0] === " " || clean[clean.length - 1] === " " || /[\t\n\r]/.test(clean));
       const tAttr = preserve ? ' xml:space="preserve"' : "";
       return `<${prefix}si><${prefix}t${tAttr}>${clean}</${prefix}t></${prefix}si>`;
@@ -5196,14 +5230,25 @@ var XlsxUpdater = class _XlsxUpdater {
     const sdEnd = sheetXml.indexOf("</sheetData>", sdStart);
     if (sdEnd === -1) return { dataStyles: /* @__PURE__ */ new Map(), headerStyles };
     const region = sheetXml.substring(sdStart, sdEnd);
-    const cellRe = /<c\b[^>]*>/g;
+    const cellRe = /<row\b[^>]*>|<c\b[^>]*>/g;
     let m;
+    let row = 0;
+    let nextCol = 0;
     while ((m = cellRe.exec(region)) !== null) {
       const tag = m[0];
+      if (tag.startsWith("<row")) {
+        const rowAttr = /\br="(\d+)"/.exec(tag);
+        row = rowAttr ? parseInt(rowAttr[1], 10) : row + 1;
+        nextCol = 0;
+        continue;
+      }
       const rMatch = /r="([A-Z]+)(\d+)"/.exec(tag);
-      if (!rMatch) continue;
-      const col = columnLetterToIndex(rMatch[1]);
-      const row = parseInt(rMatch[2], 10);
+      let col = nextCol;
+      if (rMatch) {
+        col = columnLetterToIndex(rMatch[1]);
+        row = parseInt(rMatch[2], 10);
+      }
+      nextCol = col + 1;
       const sMatch = /s="(\d+)"/.exec(tag);
       if (!sMatch) continue;
       const s = parseInt(sMatch[1], 10);
@@ -5324,7 +5369,7 @@ var XlsxUpdater = class _XlsxUpdater {
     const colRef = columnIndexToLetter(col);
     const styleAttr = style > 0 ? ` s="${style}"` : "";
     if (this.sharedStringsXml === null) {
-      const clean = escapeXmlText(text);
+      const clean = escapeXlsxText(text);
       const preserve = clean.length > 0 && (clean[0] === " " || clean[clean.length - 1] === " " || /[\t\n\r]/.test(clean));
       const tAttr = preserve ? ' xml:space="preserve"' : "";
       return `<c r="${colRef}${rowNum}" t="inlineStr"${styleAttr}><is><t${tAttr}>${clean}</t></is></c>`;
@@ -6863,6 +6908,7 @@ export {
   convertXlsbToXlsx,
   convertXlsxToXlsb,
   defaultColWidth,
+  escapeXlsxText,
   escapeXmlText,
   getFormat,
   initColWidths,
@@ -6873,6 +6919,7 @@ export {
   sanitizeSheetName,
   trimTrailingEmptyRows,
   unescapeXml,
+  unescapeXmlText,
   unwrapCell,
   updateColWidthsFromRows
 };