@sunertech/docx 10.0.1 → 10.0.3

package/dist/index.cjs

@@ -10487,9 +10487,34 @@ function Base64_encode(input) {
   }
   return o;
 }
+function Base64_encode_arr(input) {
+  var o = "";
+  var c1 = 0, c2 = 0, c3 = 0, e1 = 0, e2 = 0, e3 = 0, e4 = 0;
+  for (var i = 0; i < input.length; ) {
+    c1 = input[i++];
+    e1 = c1 >> 2;
+    c2 = input[i++];
+    e2 = (c1 & 3) << 4 | c2 >> 4;
+    c3 = input[i++];
+    e3 = (c2 & 15) << 2 | c3 >> 6;
+    e4 = c3 & 63;
+    if (isNaN(c2)) {
+      e3 = e4 = 64;
+    } else if (isNaN(c3)) {
+      e4 = 64;
+    }
+    o += Base64_map.charAt(e1) + Base64_map.charAt(e2) + Base64_map.charAt(e3) + Base64_map.charAt(e4);
+  }
+  return o;
+}
 function Base64_decode(input) {
   var o = "";
   var c1 = 0, c2 = 0, c3 = 0, e1 = 0, e2 = 0, e3 = 0, e4 = 0;
+  if (input.slice(0, 5) == "data:") {
+    var i = input.slice(0, 1024).indexOf(";base64,");
+    if (i > -1)
+      input = input.slice(i + 8);
+  }
   input = input.replace(/[^\w\+\/\=]/g, "");
   for (var i = 0; i < input.length; ) {
     e1 = Base64_map.indexOf(input.charAt(i++));
@@ -10527,6 +10552,13 @@ var Buffer_from = /* @__PURE__ */ (function() {
   return function() {
   };
 })();
+var buf_utf16le = /* @__PURE__ */ (function() {
+  if (typeof Buffer === "undefined") return false;
+  var x = Buffer_from([65, 0]);
+  if (!x) return false;
+  var o = x.toString("utf16le");
+  return o.length == 1;
+})();
 function new_raw_buf(len) {
   if (has_buf) return Buffer.alloc ? Buffer.alloc(len) : new Buffer(len);
   return typeof Uint8Array != "undefined" ? new Uint8Array(len) : new Array(len);
@@ -10572,9 +10604,8 @@ var bconcat = has_buf ? function(bufs) {
     for (i = 0, maxlen = 0; i < bufs.length; maxlen += len, ++i) {
       len = bufs[i].length;
       if (bufs[i] instanceof Uint8Array) o.set(bufs[i], maxlen);
-      else if (typeof bufs[i] == "string") {
-        throw "wtf";
-      } else o.set(new Uint8Array(bufs[i]), maxlen);
+      else if (typeof bufs[i] == "string") o.set(new Uint8Array(s2a(bufs[i])), maxlen);
+      else o.set(new Uint8Array(bufs[i]), maxlen);
     }
     return o;
   }
@@ -10843,8 +10874,19 @@ function SSF_frac(x, D, mixed) {
   var q = Math.floor(sgn * P / Q);
   return [q, sgn * P - q * Q, Q];
 }
+function SSF_normalize_xl_unsafe(v) {
+  var s = v.toPrecision(16);
+  if (s.indexOf("e") > -1) {
+    var m = s.slice(0, s.indexOf("e"));
+    m = m.indexOf(".") > -1 ? m.slice(0, m.slice(0, 2) == "0." ? 17 : 16) : m.slice(0, 15) + fill("0", m.length - 15);
+    return m + s.slice(s.indexOf("e"));
+  }
+  var n = s.indexOf(".") > -1 ? s.slice(0, s.slice(0, 2) == "0." ? 17 : 16) : s.slice(0, 15) + fill("0", s.length - 15);
+  return Number(n);
+}
 function SSF_parse_date_code(v, opts, b2) {
   if (v > 2958465 || v < 0) return null;
+  v = SSF_normalize_xl_unsafe(v);
   var date = v | 0, time = Math.floor(86400 * (v - date)), dow = 0;
   var dout = [];
   var out = { D: date, T: time, u: 86400 * (v - date) - time, y: 0, m: 0, d: 0, H: 0, M: 0, S: 0, q: 0 };
@@ -10884,15 +10926,6 @@ function SSF_parse_date_code(v, opts, b2) {
   out.q = dow;
   return out;
 }
-var SSFbasedate = /* @__PURE__ */ new Date(1899, 11, 31, 0, 0, 0);
-var SSFdnthresh = /* @__PURE__ */ SSFbasedate.getTime();
-var SSFbase1904 = /* @__PURE__ */ new Date(1900, 2, 1, 0, 0, 0);
-function datenum_local(v, date1904) {
-  var epoch = /* @__PURE__ */ v.getTime();
-  if (date1904) epoch -= 1461 * 24 * 60 * 60 * 1e3;
-  else if (v >= SSFbase1904) epoch += 24 * 60 * 60 * 1e3;
-  return (epoch - (SSFdnthresh + (/* @__PURE__ */ v.getTimezoneOffset() - /* @__PURE__ */ SSFbasedate.getTimezoneOffset()) * 6e4)) / (24 * 60 * 60 * 1e3);
-}
 function SSF_strip_decimal(o) {
   return o.indexOf(".") == -1 ? o : o.replace(/(?:\.0*|(\.\d*[1-9])0+)$/, "$1");
 }
@@ -10913,6 +10946,7 @@ function SSF_large_exp(v) {
   return o.length > (v < 0 ? 12 : 11) || o === "0" || o === "-0" ? v.toPrecision(6) : o;
 }
 function SSF_general_num(v) {
+  if (!isFinite(v)) return isNaN(v) ? "#NUM!" : "#DIV/0!";
   var V = Math.floor(Math.log(Math.abs(v)) * Math.LOG10E), o;
   if (V >= -4 && V <= -1) o = v.toPrecision(10 + V);
   else if (Math.abs(V) <= 9) o = SSF_small_exp(v);
@@ -10932,7 +10966,7 @@ function SSF_general(v, opts) {
       return "";
     case "object":
       if (v == null) return "";
-      if (v instanceof Date) return SSF_format(14, datenum_local(v, opts && opts.date1904), opts);
+      if (v instanceof Date) return SSF_format(14, datenum(v, opts && opts.date1904), opts);
   }
   throw new Error("unsupported value in General format: " + v);
 }
@@ -11045,7 +11079,7 @@ function SSF_write_date(type2, fmt, val, ss0) {
           break;
         case "[s]":
         case "[ss]":
-          out = ((val.D * 24 + val.H) * 60 + val.M) * 60 + Math.round(val.S + val.u);
+          out = ((val.D * 24 + val.H) * 60 + val.M) * 60 + (ss0 == 0 ? Math.round(val.S + val.u) : val.S);
           break;
         default:
           throw "bad abstime format: " + fmt;
@@ -11116,7 +11150,7 @@ function write_num_f2(r, aval, sign2) {
   return sign2 + (aval === 0 ? "" : "" + aval) + fill(" ", r[1].length + 2 + r[4].length);
 }
 var dec1 = /^#*0*\.([0#]+)/;
-var closeparen = /\).*[0#]/;
+var closeparen = /\)[^)]*[0#]/;
 var phone = /\(###\) ###\\?-####/;
 function hashq(str) {
   var o = "", cc;
@@ -11600,7 +11634,7 @@ function eval_fmt(fmt, v, opts, flen) {
         var q = { t: c, v: c };
         if (dt == null) dt = SSF_parse_date_code(v, opts);
         if (fmt.substr(i, 3).toUpperCase() === "A/P") {
-          if (dt != null) q.v = dt.H >= 12 ? "P" : "A";
+          if (dt != null) q.v = dt.H >= 12 ? fmt.charAt(i + 2) : c;
           q.t = "T";
           hr = "h";
           i += 3;
@@ -11707,15 +11741,21 @@ function eval_fmt(fmt, v, opts, flen) {
         if (bt < 1) bt = 1;
         break;
       case "s":
-        if (ssm = out[i].v.match(/\.0+$/)) ss0 = Math.max(ss0, ssm[0].length - 1);
+        if (ssm = out[i].v.match(/\.0+$/)) {
+          ss0 = Math.max(ss0, ssm[0].length - 1);
+          bt = 4;
+        }
         if (bt < 3) bt = 3;
       /* falls through */
       case "d":
       case "y":
-      case "M":
       case "e":
         lst = out[i].t;
         break;
+      case "M":
+        lst = out[i].t;
+        if (bt < 2) bt = 2;
+        break;
       case "m":
         if (lst === "s") {
           out[i].t = "M";
@@ -11730,10 +11770,13 @@ function eval_fmt(fmt, v, opts, flen) {
         if (bt < 3 && out[i].v.match(/[Ss]/)) bt = 3;
     }
   }
+  var _dt;
   switch (bt) {
     case 0:
       break;
     case 1:
+    case 2:
+    case 3:
       if (dt.u >= 0.5) {
         dt.u = 0;
         ++dt.S;
@@ -11746,9 +11789,30 @@ function eval_fmt(fmt, v, opts, flen) {
         dt.M = 0;
         ++dt.H;
       }
+      if (dt.H >= 24) {
+        dt.H = 0;
+        ++dt.D;
+        _dt = SSF_parse_date_code(dt.D);
+        _dt.u = dt.u;
+        _dt.S = dt.S;
+        _dt.M = dt.M;
+        _dt.H = dt.H;
+        dt = _dt;
+      }
       break;
-    case 2:
-      if (dt.u >= 0.5) {
+    case 4:
+      switch (ss0) {
+        case 1:
+          dt.u = Math.round(dt.u * 10) / 10;
+          break;
+        case 2:
+          dt.u = Math.round(dt.u * 100) / 100;
+          break;
+        case 3:
+          dt.u = Math.round(dt.u * 1e3) / 1e3;
+          break;
+      }
+      if (dt.u >= 1) {
         dt.u = 0;
         ++dt.S;
       }
@@ -11756,6 +11820,20 @@ function eval_fmt(fmt, v, opts, flen) {
         dt.S = 0;
         ++dt.M;
       }
+      if (dt.M >= 60) {
+        dt.M = 0;
+        ++dt.H;
+      }
+      if (dt.H >= 24) {
+        dt.H = 0;
+        ++dt.D;
+        _dt = SSF_parse_date_code(dt.D);
+        _dt.u = dt.u;
+        _dt.S = dt.S;
+        _dt.M = dt.M;
+        _dt.H = dt.H;
+        dt = _dt;
+      }
       break;
   }
   var nstr = "", jj;
@@ -11904,6 +11982,7 @@ function choose_fmt(f, v) {
   if (l < 4 && lat > -1) --l;
   if (fmt.length > 4) throw new Error("cannot find right format for |" + fmt.join("|") + "|");
   if (typeof v !== "number") return [4, fmt.length === 4 || lat > -1 ? fmt[fmt.length - 1] : "@"];
+  if (typeof v === "number" && !isFinite(v)) v = 0;
   switch (fmt.length) {
     case 1:
       fmt = lat > -1 ? ["General", "General", "General", fmt[0]] : [fmt[0], fmt[0], fmt[0], "@"];
@@ -11940,12 +12019,14 @@ function SSF_format(fmt, v, o) {
       break;
   }
   if (SSF_isgeneral(sfmt, 0)) return SSF_general(v, o);
-  if (v instanceof Date) v = datenum_local(v, o.date1904);
+  if (v instanceof Date) v = datenum(v, o.date1904);
   var f = choose_fmt(sfmt, v);
   if (SSF_isgeneral(f[1])) return SSF_general(v, o);
   if (v === true) v = "TRUE";
   else if (v === false) v = "FALSE";
   else if (v === "" || v == null) return "";
+  else if (isNaN(v) && f[1].indexOf("0") > -1) return "#NUM!";
+  else if (!isFinite(v) && f[1].indexOf("0") > -1) return "#DIV/0!";
   return eval_fmt(f[1], v, o, f[0]);
 }
 function SSF_load(fmt, idx) {
@@ -11973,6 +12054,13 @@ function SSF_load_table(tbl) {
 function make_ssf() {
   table_fmt = SSF_init_table();
 }
+var bad_formats = {
+  "d.m": "d\\.m"
+  // Issue #2571 Google Sheets writes invalid format 'd.m', correct format is 'd"."m' or 'd\\.m'
+};
+function SSF__load(fmt, idx) {
+  return SSF_load(bad_formats[fmt] || fmt, idx);
+}
 var CRC32 = /* @__PURE__ */ (function() {
   var CRC322 = {};
   CRC322.version = "1.2.0";
@@ -12001,7 +12089,7 @@ var CRC32 = /* @__PURE__ */ (function() {
       for (c = 256 + n; c < 4096; c += 256) v = table[c] = v >>> 8 ^ T[v & 255];
     }
     var out = [];
-    for (n = 1; n != 16; ++n) out[n - 1] = typeof Int32Array !== "undefined" ? table.subarray(n * 256, n * 256 + 256) : table.slice(n * 256, n * 256 + 256);
+    for (n = 1; n != 16; ++n) out[n - 1] = typeof Int32Array !== "undefined" && typeof table.subarray == "function" ? table.subarray(n * 256, n * 256 + 256) : table.slice(n * 256, n * 256 + 256);
     return out;
   }
   var TT = slice_by_16_tables(T0);
@@ -12051,8 +12139,11 @@ var CRC32 = /* @__PURE__ */ (function() {
   return CRC322;
 })();
 var CFB = /* @__PURE__ */ (function _CFB() {
-  var exports2 = {};
-  exports2.version = "1.2.1";
+  var exports2 = (
+    /*::(*/
+    {}
+  );
+  exports2.version = "1.2.2";
   function namecmp(l, r) {
     var L = l.split("/"), R = r.split("/");
     for (var i2 = 0, c = 0, Z = Math.min(L.length, R.length); i2 < Z; ++i2) {
@@ -12127,6 +12218,16 @@ var CFB = /* @__PURE__ */ (function _CFB() {
             if (p.mtime) p.mt = new Date(p.mtime * 1e3);
           }
           break;
+        /* ZIP64 Extended Information Field */
+        case 1:
+          {
+            var sz1 = blob.read_shift(4), sz2 = blob.read_shift(4);
+            p.usz = sz2 * Math.pow(2, 32) + sz1;
+            sz1 = blob.read_shift(4);
+            sz2 = blob.read_shift(4);
+            p.csz = sz2 * Math.pow(2, 32) + sz1;
+          }
+          break;
       }
       blob.l = tgt;
       o[type2] = p;
@@ -12135,7 +12236,7 @@ var CFB = /* @__PURE__ */ (function _CFB() {
   }
   var fs;
   function get_fs() {
-    return fs || (fs = {});
+    return fs || (fs = _fs);
   }
   function parse(file, options) {
     if (file[0] == 80 && file[1] == 75) return parse_zip(file, options);
@@ -12198,7 +12299,7 @@ var CFB = /* @__PURE__ */ (function _CFB() {
     var sectors = sectorify(file, ssz);
     sleuth_fat(difat_start, difat_sec_cnt, sectors, ssz, fat_addrs);
     var sector_list = make_sector_list(sectors, dir_start, fat_addrs, ssz);
-    sector_list[dir_start].name = "!Directory";
+    if (dir_start < sector_list.length) sector_list[dir_start].name = "!Directory";
     if (nmfs > 0 && minifat_start !== ENDOFCHAIN) sector_list[minifat_start].name = "!MiniFAT";
     sector_list[fat_addrs[0]].name = "!FAT";
     sector_list.fat_addrs = fat_addrs;
@@ -12311,7 +12412,7 @@ var CFB = /* @__PURE__ */ (function _CFB() {
         if ((q2 = __readInt32LE(sector, i2 * 4)) === ENDOFCHAIN) break;
         fat_addrs.push(q2);
       }
-      sleuth_fat(__readInt32LE(sector, ssz - 4), cnt - 1, sectors, ssz, fat_addrs);
+      if (cnt >= 1) sleuth_fat(__readInt32LE(sector, ssz - 4), cnt - 1, sectors, ssz, fat_addrs);
     }
   }
   function get_sector_list(sectors, start, fat_addrs, ssz, chkd) {
@@ -12499,7 +12600,8 @@ var CFB = /* @__PURE__ */ (function _CFB() {
     for (i2 = 0; i2 < data.length; ++i2) {
       var dad = dirname(data[i2][0]);
       s = fullPaths[dad];
-      if (!s) {
+      while (!s) {
+        while (dirname(dad) && !fullPaths[dirname(dad)]) dad = dirname(dad);
         data.push([dad, {
           name: filename(dad).replace("/", ""),
           type: 1,
@@ -12509,6 +12611,8 @@ var CFB = /* @__PURE__ */ (function _CFB() {
           content: null
         }]);
         fullPaths[dad] = true;
+        dad = dirname(data[i2][0]);
+        s = fullPaths[dad];
       }
     }
     data.sort(function(x, y) {
@@ -12648,6 +12752,10 @@ var CFB = /* @__PURE__ */ (function _CFB() {
       file = cfb.FileIndex[i2];
       if (i2 === 0) file.start = file.size ? file.start - 1 : ENDOFCHAIN;
       var _nm = i2 === 0 && _opts.root || file.name;
+      if (_nm.length > 31) {
+        console.error("Name " + _nm + " will be truncated to " + _nm.slice(0, 31));
+        _nm = _nm.slice(0, 31);
+      }
       flen = 2 * (_nm.length + 1);
       o.write_shift(64, _nm, "utf16le");
       o.write_shift(2, flen);
@@ -13251,6 +13359,10 @@ var CFB = /* @__PURE__ */ (function _CFB() {
       blob.l += namelen + efsz + fcsz;
       var L = blob.l;
       blob.l = offset + 4;
+      if (EF && EF[1]) {
+        if ((EF[1] || {}).usz) usz = EF[1].usz;
+        if ((EF[1] || {}).csz) csz = EF[1].csz;
+      }
       parse_local_file(blob, csz, usz, o, EF);
       blob.l = L;
     }
@@ -13276,7 +13388,13 @@ var CFB = /* @__PURE__ */ (function _CFB() {
         /*:: :any)*/
       );
       if ((ef[21589] || {}).mt) date = ef[21589].mt;
-      if (((EF || {})[21589] || {}).mt) date = EF[21589].mt;
+      if ((ef[1] || {}).usz) _usz = ef[1].usz;
+      if ((ef[1] || {}).csz) _csz = ef[1].csz;
+      if (EF) {
+        if ((EF[21589] || {}).mt) date = EF[21589].mt;
+        if ((EF[1] || {}).usz) _usz = EF[1].usz;
+        if ((EF[1] || {}).csz) _csz = EF[1].csz;
+      }
     }
     blob.l += efsz;
     var data = blob.slice(blob.l, blob.l + _csz);
@@ -13285,6 +13403,7 @@ var CFB = /* @__PURE__ */ (function _CFB() {
         data = _inflateRawSync(blob, _usz);
         break;
       case 0:
+        blob.l += _csz;
         break;
       // TODO: scan for magic number
       default:
@@ -13317,17 +13436,17 @@ var CFB = /* @__PURE__ */ (function _CFB() {
     for (i2 = 1; i2 < cfb.FullPaths.length; ++i2) {
       fp = cfb.FullPaths[i2].slice(root.length);
       fi = cfb.FileIndex[i2];
-      if (!fi.size || !fi.content || fp == "
Sh33tJ5") continue;
+      if (!fi.size || !fi.content || Array.isArray(fi.content) && fi.content.length == 0 || fp == "
Sh33tJ5") continue;
       var start = start_cd;
       var namebuf = new_buf(fp.length);
       for (j = 0; j < fp.length; ++j) namebuf.write_shift(1, fp.charCodeAt(j) & 127);
       namebuf = namebuf.slice(0, namebuf.l);
-      crcs[fcnt] = CRC32.buf(
+      crcs[fcnt] = typeof fi.content == "string" ? CRC32.bstr(fi.content, 0) : CRC32.buf(
         /*::((*/
         fi.content,
         0
       );
-      var outbuf = fi.content;
+      var outbuf = typeof fi.content == "string" ? s2a(fi.content) : fi.content;
       if (method == 8) outbuf = _deflateRawSync(outbuf);
       o = new_buf(30);
       o.write_shift(4, 67324752);
@@ -13462,7 +13581,7 @@ var CFB = /* @__PURE__ */ (function _CFB() {
     for (; di < 10; ++di) {
       var line = data[di];
       if (!line || line.match(/^\s*$/)) break;
-      var m = line.match(/^(.*?):\s*([^\s].*)$/);
+      var m = line.match(/^([^:]*?):\s*([^\s].*)$/);
       if (m) switch (m[1].toLowerCase()) {
         case "content-location":
           fname = m[2].trim();
@@ -13639,6 +13758,7 @@ var CFB = /* @__PURE__ */ (function _CFB() {
   };
   return exports2;
 })();
+var _fs;
 function blobify(data) {
   if (typeof data === "string") return s2ab(data);
   if (Array.isArray(data)) return a2u(data);
@@ -13674,6 +13794,9 @@ function write_dl(fname, payload, enc) {
         }, 6e4);
         return url;
       }
+    } else if (typeof URL !== "undefined" && !URL.createObjectURL && typeof chrome === "object") {
+      var b64 = "data:application/octet-stream;base64," + Base64_encode_arr(new Uint8Array(blobify(data)));
+      return chrome.downloads.download({ url: b64, filename: fname, saveAs: true });
     }
   }
   if (typeof $ !== "undefined" && typeof File !== "undefined" && typeof Folder !== "undefined") try {
@@ -13685,7 +13808,7 @@ function write_dl(fname, payload, enc) {
     out.close();
     return payload;
   } catch (e) {
-    if (!e.message || !e.message.match(/onstruct/)) throw e;
+    if (!e.message || e.message.indexOf("onstruct") == -1) throw e;
   }
   throw new Error("cannot save file " + fname);
 }
@@ -13712,34 +13835,38 @@ function evert_arr(obj) {
   }
   return o;
 }
-var basedate = /* @__PURE__ */ new Date(1899, 11, 30, 0, 0, 0);
+var dnthresh = /* @__PURE__ */ Date.UTC(1899, 11, 30, 0, 0, 0);
+var dnthresh1 = /* @__PURE__ */ Date.UTC(1899, 11, 31, 0, 0, 0);
+var dnthresh2 = /* @__PURE__ */ Date.UTC(1904, 0, 1, 0, 0, 0);
 function datenum(v, date1904) {
   var epoch = /* @__PURE__ */ v.getTime();
-  var dnthresh = /* @__PURE__ */ basedate.getTime() + (/* @__PURE__ */ v.getTimezoneOffset() - /* @__PURE__ */ basedate.getTimezoneOffset()) * 6e4;
-  return (epoch - dnthresh) / (24 * 60 * 60 * 1e3);
-}
-var good_pd_date_1 = /* @__PURE__ */ new Date("2017-02-19T19:06:09.000Z");
-var good_pd_date = /* @__PURE__ */ isNaN(/* @__PURE__ */ good_pd_date_1.getFullYear()) ? /* @__PURE__ */ new Date("2/19/17") : good_pd_date_1;
-var good_pd = /* @__PURE__ */ good_pd_date.getFullYear() == 2017;
-function parseDate(str, fixdate) {
-  var d = new Date(str);
-  if (good_pd) {
-    if (fixdate > 0) d.setTime(d.getTime() + d.getTimezoneOffset() * 60 * 1e3);
-    else if (fixdate < 0) d.setTime(d.getTime() - d.getTimezoneOffset() * 60 * 1e3);
-    return d;
+  var res = (epoch - dnthresh) / (24 * 60 * 60 * 1e3);
+  if (date1904) {
+    res -= 1462;
+    return res < -1402 ? res - 1 : res;
   }
-  if (str instanceof Date) return str;
-  if (good_pd_date.getFullYear() == 1917 && !isNaN(d.getFullYear())) {
-    var s = d.getFullYear();
-    if (str.indexOf("" + s) > -1) return d;
-    d.setFullYear(d.getFullYear() + 100);
-    return d;
-  }
-  var n = str.match(/\d+/g) || ["2017", "2", "19", "0", "0", "0"];
-  var out = new Date(+n[0], +n[1] - 1, +n[2], +n[3] || 0, +n[4] || 0, +n[5] || 0);
-  if (str.indexOf("Z") > -1) out = new Date(out.getTime() - out.getTimezoneOffset() * 60 * 1e3);
+  return res < 60 ? res - 1 : res;
+}
+function numdate(v) {
+  if (v >= 60 && v < 61) return v;
+  var out = /* @__PURE__ */ new Date();
+  out.setTime((v > 60 ? v : v + 1) * 24 * 60 * 60 * 1e3 + dnthresh);
   return out;
 }
+var pdre1 = /^(\d+):(\d+)(:\d+)?(\.\d+)?$/;
+var pdre2 = /^(\d+)-(\d+)-(\d+)$/;
+var pdre3 = /^(\d+)-(\d+)-(\d+)[T ](\d+):(\d+)(:\d+)?(\.\d+)?$/;
+function parseDate(str, date1904) {
+  if (str instanceof Date) return str;
+  var m = str.match(pdre1);
+  if (m) return new Date((date1904 ? dnthresh2 : dnthresh1) + ((parseInt(m[1], 10) * 60 + parseInt(m[2], 10)) * 60 + (m[3] ? parseInt(m[3].slice(1), 10) : 0)) * 1e3 + (m[4] ? parseInt((m[4] + "000").slice(1, 4), 10) : 0));
+  m = str.match(pdre2);
+  if (m) return new Date(Date.UTC(+m[1], +m[2] - 1, +m[3], 0, 0, 0, 0));
+  m = str.match(pdre3);
+  if (m) return new Date(Date.UTC(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], m[6] && parseInt(m[6].slice(1), 10) || 0, m[7] && parseInt((m[7] + "0000").slice(1, 4), 10) || 0));
+  var d = new Date(str);
+  return d;
+}
 function dup(o) {
   if (typeof JSON != "undefined" && !Array.isArray(o)) return JSON.parse(JSON.stringify(o));
   if (typeof o != "object" || o == null) return o;
@@ -13763,30 +13890,67 @@ function fuzzynum(s) {
     return "";
   });
   if (!isNaN(v = Number(ss))) return v / wt;
-  ss = ss.replace(/[(](.*)[)]/, function($$, $1) {
+  ss = ss.replace(/[(]([^()]*)[)]/, function($$, $1) {
     wt = -wt;
     return $1;
   });
   if (!isNaN(v = Number(ss))) return v / wt;
   return v;
 }
+var FDRE1 = /^(0?\d|1[0-2])(?:|:([0-5]?\d)(?:|(\.\d+)(?:|:([0-5]?\d))|:([0-5]?\d)(|\.\d+)))\s+([ap])m?$/;
+var FDRE2 = /^([01]?\d|2[0-3])(?:|:([0-5]?\d)(?:|(\.\d+)(?:|:([0-5]?\d))|:([0-5]?\d)(|\.\d+)))$/;
+var FDISO = /^(\d+)-(\d+)-(\d+)[T ](\d+):(\d+)(:\d+)(\.\d+)?[Z]?$/;
+var utc_append_works = (/* @__PURE__ */ new Date("6/9/69 00:00 UTC")).valueOf() == -177984e5;
+function fuzzytime1(M) {
+  if (!M[2]) return new Date(Date.UTC(1899, 11, 31, +M[1] % 12 + (M[7] == "p" ? 12 : 0), 0, 0, 0));
+  if (M[3]) {
+    if (M[4]) return new Date(Date.UTC(1899, 11, 31, +M[1] % 12 + (M[7] == "p" ? 12 : 0), +M[2], +M[4], parseFloat(M[3]) * 1e3));
+    else return new Date(Date.UTC(1899, 11, 31, M[7] == "p" ? 12 : 0, +M[1], +M[2], parseFloat(M[3]) * 1e3));
+  } else if (M[5]) return new Date(Date.UTC(1899, 11, 31, +M[1] % 12 + (M[7] == "p" ? 12 : 0), +M[2], +M[5], M[6] ? parseFloat(M[6]) * 1e3 : 0));
+  else return new Date(Date.UTC(1899, 11, 31, +M[1] % 12 + (M[7] == "p" ? 12 : 0), +M[2], 0, 0));
+}
+function fuzzytime2(M) {
+  if (!M[2]) return new Date(Date.UTC(1899, 11, 31, +M[1], 0, 0, 0));
+  if (M[3]) {
+    if (M[4]) return new Date(Date.UTC(1899, 11, 31, +M[1], +M[2], +M[4], parseFloat(M[3]) * 1e3));
+    else return new Date(Date.UTC(1899, 11, 31, 0, +M[1], +M[2], parseFloat(M[3]) * 1e3));
+  } else if (M[5]) return new Date(Date.UTC(1899, 11, 31, +M[1], +M[2], +M[5], M[6] ? parseFloat(M[6]) * 1e3 : 0));
+  else return new Date(Date.UTC(1899, 11, 31, +M[1], +M[2], 0, 0));
+}
 var lower_months = ["january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"];
 function fuzzydate(s) {
-  var o = new Date(s), n = /* @__PURE__ */ new Date(NaN);
-  var y = o.getYear(), m = o.getMonth(), d = o.getDate();
-  if (isNaN(d)) return n;
+  if (FDISO.test(s)) return s.indexOf("Z") == -1 ? local_to_utc(new Date(s)) : new Date(s);
   var lower = s.toLowerCase();
+  var lnos = lower.replace(/\s+/g, " ").trim();
+  var M = lnos.match(FDRE1);
+  if (M) return fuzzytime1(M);
+  M = lnos.match(FDRE2);
+  if (M) return fuzzytime2(M);
+  M = lnos.match(pdre3);
+  if (M) return new Date(Date.UTC(+M[1], +M[2] - 1, +M[3], +M[4], +M[5], M[6] && parseInt(M[6].slice(1), 10) || 0, M[7] && parseInt((M[7] + "0000").slice(1, 4), 10) || 0));
+  var o = new Date(utc_append_works && s.indexOf("UTC") == -1 ? s + " UTC" : s), n = /* @__PURE__ */ new Date(NaN);
+  var y = o.getYear();
+  o.getMonth();
+  var d = o.getDate();
+  if (isNaN(d)) return n;
   if (lower.match(/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/)) {
     lower = lower.replace(/[^a-z]/g, "").replace(/([^a-z]|^)[ap]m?([^a-z]|$)/, "");
     if (lower.length > 3 && lower_months.indexOf(lower) == -1) return n;
-  } else if (lower.match(/[a-z]/)) return n;
-  if (y < 0 || y > 8099) return n;
-  if ((m > 0 || d > 1) && y != 101) return o;
-  if (s.match(/[^-0-9:,\/\\]/)) return n;
+  } else if (lower.replace(/[ap]m?/, "").match(/[a-z]/)) return n;
+  if (y < 0 || y > 8099 || s.match(/[^-0-9:,\/\\\ ]/)) return n;
   return o;
 }
+function utc_to_local(utc) {
+  return new Date(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate(), utc.getUTCHours(), utc.getUTCMinutes(), utc.getUTCSeconds(), utc.getUTCMilliseconds());
+}
+function local_to_utc(local) {
+  return new Date(Date.UTC(local.getFullYear(), local.getMonth(), local.getDate(), local.getHours(), local.getMinutes(), local.getSeconds(), local.getMilliseconds()));
+}
 function zip_add_file(zip, path, content) {
   if (zip.FullPaths) {
+    if (Array.isArray(content) && typeof content[0] == "string") {
+      content = content.join("");
+    }
     if (typeof content == "string") {
       var res;
       if (has_buf) res = Buffer_from(content);
@@ -13808,7 +13972,7 @@ var encodings = {
   "&amp;": "&"
 };
 var rencoding = /* @__PURE__ */ evert(encodings);
-var decregex = /[&<>'"]/g, charegex = /[\u0000-\u0008\u000b-\u001f]/g;
+var decregex = /[&<>'"]/g, charegex = /[\u0000-\u0008\u000b-\u001f\uFFFE-\uFFFF]/g;
 function escapexml(text) {
   var s = text + "";
   return s.replace(decregex, function(y) {
@@ -13929,7 +14093,7 @@ var htmldecode = /* @__PURE__ */ (function() {
     return [new RegExp("&" + x[0] + ";", "ig"), x[1]];
   });
   return function htmldecode2(str) {
-    var o = str.replace(/^[\t\n\r ]+/, "").replace(/[\t\n\r ]+$/, "").replace(/>\s+/g, ">").replace(/\s+</g, "<").replace(/[\t\n\r ]+/g, " ").replace(/<\s*[bB][rR]\s*\/?>/g, "\n").replace(/<[^>]*>/g, "");
+    var o = str.replace(/^[\t\n\r ]+/, "").replace(/(^|[^\t\n\r ])[\t\n\r ]+$/, "$1").replace(/>\s+/g, ">").replace(/\b\s+</g, "<").replace(/[\t\n\r ]+/g, " ").replace(/<\s*[bB][rR]\s*\/?>/g, "\n").replace(/<[^<>]*>/g, "");
     for (var i = 0; i < entities.length; ++i) o = o.replace(entities[i][0], entities[i][1]);
     return o;
   };
@@ -14045,7 +14209,7 @@ var ___utf16le = function(b, s, e) {
   return ss.join("").replace(chr0, "");
 };
 var __utf16le = has_buf ? function(b, s, e) {
-  if (!Buffer.isBuffer(b)) return ___utf16le(b, s, e);
+  if (!Buffer.isBuffer(b) || !buf_utf16le) return ___utf16le(b, s, e);
   return b.toString("utf16le", s, e).replace(chr0, "");
 } : ___utf16le;
 var ___hexlify = function(b, s, l) {
@@ -14105,12 +14269,12 @@ if (has_buf) {
     return len > 0 ? b.toString("utf8", i + 4, i + 4 + len - 1) : "";
   };
   __lpwstr = function lpwstr_b(b, i) {
-    if (!Buffer.isBuffer(b)) return ___lpwstr(b, i);
+    if (!Buffer.isBuffer(b) || !buf_utf16le) return ___lpwstr(b, i);
     var len = 2 * b.readUInt32LE(i);
     return b.toString("utf16le", i + 4, i + 4 + len - 1);
   };
   __lpp4 = function lpp4_b(b, i) {
-    if (!Buffer.isBuffer(b)) return ___lpp4(b, i);
+    if (!Buffer.isBuffer(b) || !buf_utf16le) return ___lpp4(b, i);
     var len = b.readUInt32LE(i);
     return b.toString("utf16le", i + 4, i + 4 + len);
   };
@@ -14148,7 +14312,7 @@ function ReadShift(size, t) {
   switch (t) {
     case "dbcs":
       loc = this.l;
-      if (has_buf && Buffer.isBuffer(this)) o = this.slice(this.l, this.l + 2 * size).toString("utf16le");
+      if (has_buf && Buffer.isBuffer(this) && buf_utf16le) o = this.slice(this.l, this.l + 2 * size).toString("utf16le");
       else for (i = 0; i < size; ++i) {
         o += String.fromCharCode(__readUInt16LE(this, loc));
         loc += 2;
@@ -14299,12 +14463,12 @@ function WriteShift(t, val, f) {
   if (f === "dbcs") {
     for (i = 0; i != val.length; ++i) __writeUInt16LE(this, val.charCodeAt(i), this.l + 2 * i);
     size = 2 * val.length;
-  } else if (f === "sbcs") {
+  } else if (f === "sbcs" || f == "cpstr") {
     {
       val = val.replace(/[^\x00-\x7F]/g, "_");
       for (i = 0; i != val.length; ++i) this[this.l + i] = val.charCodeAt(i) & 255;
+      size = val.length;
     }
-    size = val.length;
   } else if (f === "hex") {
     for (; i < t; ++i) {
       this[this.l++] = parseInt(val.slice(2 * i, 2 * i + 2), 16) || 0;
@@ -14430,6 +14594,15 @@ function encode_range(cs, ce) {
   if (typeof ce !== "string") ce = encode_cell(ce);
   return cs == ce ? cs : cs + ":" + ce;
 }
+function fix_range(a1) {
+  var s = decode_range(a1);
+  return "$" + encode_col(s.s.c) + "$" + encode_row(s.s.r) + ":$" + encode_col(s.e.c) + "$" + encode_row(s.e.r);
+}
+function formula_quote_sheet_name(sname, opts) {
+  if (!sname && true) throw new Error("empty sheet name");
+  if (/[^\w\u4E00-\u9FFF\u3040-\u30FF]/.test(sname)) return "'" + sname.replace(/'/g, "''") + "'";
+  return sname;
+}
 function safe_decode_range(range2) {
   var o = { s: { c: 0, r: 0 }, e: { c: 0, r: 0 } };
   var idx = 0, i = 0, cc = 0;
@@ -14488,10 +14661,17 @@ function sheet_to_workbook(sheet, opts) {
   sheets[n] = sheet;
   return { SheetNames: [n], Sheets: sheets };
 }
+function sheet_new(opts) {
+  var out = {};
+  var o = opts || {};
+  if (o.dense) out["!data"] = [];
+  return out;
+}
 function sheet_add_aoa(_ws, data, opts) {
   var o = opts || {};
-  var dense = _ws ? Array.isArray(_ws) : o.dense;
-  var ws = _ws || (dense ? [] : {});
+  var dense = _ws ? _ws["!data"] != null : o.dense;
+  var ws = _ws || (dense ? { "!data": [] } : {});
+  if (dense && !ws["!data"]) ws["!data"] = [];
   var _R = 0, _C = 0;
   if (ws && o.origin != null) {
     if (typeof o.origin == "number") _R = o.origin;
@@ -14500,7 +14680,6 @@ function sheet_add_aoa(_ws, data, opts) {
       _R = _origin.r;
       _C = _origin.c;
     }
-    if (!ws["!ref"]) ws["!ref"] = "A1:A1";
   }
   var range2 = { s: { c: 1e7, r: 1e7 }, e: { c: 0, r: 0 } };
   if (ws["!ref"]) {
@@ -14509,23 +14688,33 @@ function sheet_add_aoa(_ws, data, opts) {
     range2.s.r = _range.s.r;
     range2.e.c = Math.max(range2.e.c, _range.e.c);
     range2.e.r = Math.max(range2.e.r, _range.e.r);
-    if (_R == -1) range2.e.r = _R = _range.e.r + 1;
+    if (_R == -1) range2.e.r = _R = ws["!ref"] ? _range.e.r + 1 : 0;
+  } else {
+    range2.s.c = range2.e.c = range2.s.r = range2.e.r = 0;
   }
+  var row = [], seen = false;
   for (var R = 0; R != data.length; ++R) {
     if (!data[R]) continue;
     if (!Array.isArray(data[R])) throw new Error("aoa_to_sheet expects an array of arrays");
-    for (var C = 0; C != data[R].length; ++C) {
-      if (typeof data[R][C] === "undefined") continue;
-      var cell = { v: data[R][C] };
-      var __R = _R + R, __C = _C + C;
+    var __R = _R + R;
+    if (dense) {
+      if (!ws["!data"][__R]) ws["!data"][__R] = [];
+      row = ws["!data"][__R];
+    }
+    var data_R = data[R];
+    for (var C = 0; C != data_R.length; ++C) {
+      if (typeof data_R[C] === "undefined") continue;
+      var cell = { v: data_R[C], t: "" };
+      var __C = _C + C;
       if (range2.s.r > __R) range2.s.r = __R;
       if (range2.s.c > __C) range2.s.c = __C;
       if (range2.e.r < __R) range2.e.r = __R;
       if (range2.e.c < __C) range2.e.c = __C;
-      if (data[R][C] && typeof data[R][C] === "object" && !Array.isArray(data[R][C]) && !(data[R][C] instanceof Date)) cell = data[R][C];
+      seen = true;
+      if (data_R[C] && typeof data_R[C] === "object" && !Array.isArray(data_R[C]) && !(data_R[C] instanceof Date)) cell = data_R[C];
       else {
         if (Array.isArray(cell.v)) {
-          cell.f = data[R][C][1];
+          cell.f = data_R[C][1];
           cell.v = cell.v[0];
         }
         if (cell.v === null) {
@@ -14535,57 +14724,67 @@ function sheet_add_aoa(_ws, data, opts) {
             cell.v = 0;
           } else if (!o.sheetStubs) continue;
           else cell.t = "z";
-        } else if (typeof cell.v === "number") cell.t = "n";
-        else if (typeof cell.v === "boolean") cell.t = "b";
+        } else if (typeof cell.v === "number") {
+          if (isFinite(cell.v)) cell.t = "n";
+          else if (isNaN(cell.v)) {
+            cell.t = "e";
+            cell.v = 15;
+          } else {
+            cell.t = "e";
+            cell.v = 7;
+          }
+        } else if (typeof cell.v === "boolean") cell.t = "b";
         else if (cell.v instanceof Date) {
           cell.z = o.dateNF || table_fmt[14];
+          if (!o.UTC) cell.v = local_to_utc(cell.v);
           if (o.cellDates) {
             cell.t = "d";
-            cell.w = SSF_format(cell.z, datenum(cell.v));
+            cell.w = SSF_format(cell.z, datenum(cell.v, o.date1904));
           } else {
             cell.t = "n";
-            cell.v = datenum(cell.v);
+            cell.v = datenum(cell.v, o.date1904);
             cell.w = SSF_format(cell.z, cell.v);
           }
         } else cell.t = "s";
       }
       if (dense) {
-        if (!ws[__R]) ws[__R] = [];
-        if (ws[__R][__C] && ws[__R][__C].z) cell.z = ws[__R][__C].z;
-        ws[__R][__C] = cell;
+        if (row[__C] && row[__C].z) cell.z = row[__C].z;
+        row[__C] = cell;
       } else {
-        var cell_ref = encode_cell({ c: __C, r: __R });
+        var cell_ref = encode_col(__C) + (__R + 1);
         if (ws[cell_ref] && ws[cell_ref].z) cell.z = ws[cell_ref].z;
         ws[cell_ref] = cell;
       }
     }
   }
-  if (range2.s.c < 1e7) ws["!ref"] = encode_range(range2);
+  if (seen && range2.s.c < 104e5) ws["!ref"] = encode_range(range2);
   return ws;
 }
 function aoa_to_sheet(data, opts) {
   return sheet_add_aoa(null, data, opts);
 }
 var BErr = {
-  /*::[*/
   0: "#NULL!",
-  /*::[*/
   7: "#DIV/0!",
-  /*::[*/
   15: "#VALUE!",
-  /*::[*/
   23: "#REF!",
-  /*::[*/
   29: "#NAME?",
-  /*::[*/
   36: "#NUM!",
-  /*::[*/
   42: "#N/A",
-  /*::[*/
   43: "#GETTING_DATA",
-  /*::[*/
   255: "#WTF?"
 };
+var RBErr = {
+  "#NULL!": 0,
+  "#DIV/0!": 7,
+  "#VALUE!": 15,
+  "#REF!": 23,
+  "#NAME?": 29,
+  "#NUM!": 36,
+  "#N/A": 42,
+  "#GETTING_DATA": 43,
+  "#WTF?": 255
+};
 var ct2type = {
   /* Workbook */
   "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml": "workbooks",
@@ -14797,35 +14996,37 @@ function new_ct() {
     xmlns: ""
   };
 }
-function write_ct(ct, opts) {
+function write_ct(ct, opts, raw) {
   var type2ct = evert_arr(ct2type);
   var o = [], v;
-  o[o.length] = XML_HEADER;
-  o[o.length] = writextag("Types", null, {
-    "xmlns": XMLNS.CT,
-    "xmlns:xsd": XMLNS.xsd,
-    "xmlns:xsi": XMLNS.xsi
-  });
-  o = o.concat([
-    ["xml", "application/xml"],
-    ["bin", "application/vnd.ms-excel.sheet.binary.macroEnabled.main"],
-    ["vml", "application/vnd.openxmlformats-officedocument.vmlDrawing"],
-    ["data", "application/vnd.openxmlformats-officedocument.model+data"],
-    /* from test files */
-    ["bmp", "image/bmp"],
-    ["png", "image/png"],
-    ["gif", "image/gif"],
-    ["emf", "image/x-emf"],
-    ["wmf", "image/x-wmf"],
-    ["jpg", "image/jpeg"],
-    ["jpeg", "image/jpeg"],
-    ["tif", "image/tiff"],
-    ["tiff", "image/tiff"],
-    ["pdf", "application/pdf"],
-    ["rels", "application/vnd.openxmlformats-package.relationships+xml"]
-  ].map(function(x) {
-    return writextag("Default", null, { "Extension": x[0], "ContentType": x[1] });
-  }));
+  {
+    o[o.length] = XML_HEADER;
+    o[o.length] = writextag("Types", null, {
+      "xmlns": XMLNS.CT,
+      "xmlns:xsd": XMLNS.xsd,
+      "xmlns:xsi": XMLNS.xsi
+    });
+    o = o.concat([
+      ["xml", "application/xml"],
+      ["bin", "application/vnd.ms-excel.sheet.binary.macroEnabled.main"],
+      ["vml", "application/vnd.openxmlformats-officedocument.vmlDrawing"],
+      ["data", "application/vnd.openxmlformats-officedocument.model+data"],
+      /* from test files */
+      ["bmp", "image/bmp"],
+      ["png", "image/png"],
+      ["gif", "image/gif"],
+      ["emf", "image/x-emf"],
+      ["wmf", "image/x-wmf"],
+      ["jpg", "image/jpeg"],
+      ["jpeg", "image/jpeg"],
+      ["tif", "image/tiff"],
+      ["tiff", "image/tiff"],
+      ["pdf", "application/pdf"],
+      ["rels", "application/vnd.openxmlformats-package.relationships+xml"]
+    ].map(function(x) {
+      return writextag("Default", null, { "Extension": x[0], "ContentType": x[1] });
+    }));
+  }
   var f1 = function(w) {
     if (ct[w] && ct[w].length > 0) {
       v = ct[w][0];
@@ -15061,6 +15262,7 @@ function write_sst_xml(sst, opts) {
     else {
       sitag += "<t";
       if (!s.t) s.t = "";
+      if (typeof s.t !== "string") s.t = String(s.t);
       if (s.t.match(straywsregex)) sitag += ' xml:space="preserve"';
       sitag += ">" + escapexml(s.t) + "</t>";
     }
@@ -15324,58 +15526,61 @@ function write_xlmeta_xml() {
   o.push('<metadata xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:xlrd="http://schemas.microsoft.com/office/spreadsheetml/2017/richdata" xmlns:xda="http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray">\n  <metadataTypes count="1">\n    <metadataType name="XLDAPR" minSupportedVersion="120000" copy="1" pasteAll="1" pasteValues="1" merge="1" splitFirst="1" rowColShift="1" clearFormats="1" clearComments="1" assign="1" coerce="1" cellMeta="1"/>\n  </metadataTypes>\n  <futureMetadata name="XLDAPR" count="1">\n    <bk>\n      <extLst>\n        <ext uri="{bdbb8cdc-fa1e-496e-a857-3c3f30c029c3}">\n          <xda:dynamicArrayProperties fDynamic="1" fCollapsed="0"/>\n        </ext>\n      </extLst>\n    </bk>\n  </futureMetadata>\n  <cellMetadata count="1">\n    <bk>\n      <rc t="1" v="0"/>\n    </bk>\n  </cellMetadata>\n</metadata>');
   return o.join("");
 }
-var _shapeid = 1024;
-function write_comments_vml(rId, comments) {
+function write_vml(rId, comments, ws) {
   var csize = [21600, 21600];
   var bbox = ["m0,0l0", csize[1], csize[0], csize[1], csize[0], "0xe"].join(",");
   var o = [
     writextag("xml", null, { "xmlns:v": XLMLNS.v, "xmlns:o": XLMLNS.o, "xmlns:x": XLMLNS.x, "xmlns:mv": XLMLNS.mv }).replace(/\/>/, ">"),
-    writextag("o:shapelayout", writextag("o:idmap", null, { "v:ext": "edit", "data": rId }), { "v:ext": "edit" }),
-    writextag("v:shapetype", [
-      writextag("v:stroke", null, { joinstyle: "miter" }),
-      writextag("v:path", null, { gradientshapeok: "t", "o:connecttype": "rect" })
-    ].join(""), { id: "_x0000_t202", "o:spt": 202, coordsize: csize.join(","), path: bbox })
+    writextag("o:shapelayout", writextag("o:idmap", null, { "v:ext": "edit", "data": rId }), { "v:ext": "edit" })
   ];
-  while (_shapeid < rId * 1e3) _shapeid += 1e3;
-  comments.forEach(function(x) {
-    var c = decode_cell(x[0]);
-    var fillopts = (
-      /*::(*/
-      { "color2": "#BEFF82", "type": "gradient" }
-    );
-    if (fillopts.type == "gradient") fillopts.angle = "-180";
-    var fillparm = fillopts.type == "gradient" ? writextag("o:fill", null, { type: "gradientUnscaled", "v:ext": "view" }) : null;
-    var fillxml = writextag("v:fill", fillparm, fillopts);
-    var shadata = { on: "t", "obscured": "t" };
+  var _shapeid = 65536 * rId;
+  var _comments = comments || [];
+  if (_comments.length > 0) o.push(writextag("v:shapetype", [
+    writextag("v:stroke", null, { joinstyle: "miter" }),
+    writextag("v:path", null, { gradientshapeok: "t", "o:connecttype": "rect" })
+  ].join(""), { id: "_x0000_t202", coordsize: csize.join(","), "o:spt": 202, path: bbox }));
+  _comments.forEach(function(x) {
     ++_shapeid;
-    o = o.concat([
-      "<v:shape" + wxt_helper({
-        id: "_x0000_s" + _shapeid,
-        type: "#_x0000_t202",
-        style: "position:absolute; margin-left:80pt;margin-top:5pt;width:104pt;height:64pt;z-index:10" + (x[1].hidden ? ";visibility:hidden" : ""),
-        fillcolor: "#ECFAD4",
-        strokecolor: "#edeaa1"
-      }) + ">",
-      fillxml,
-      writextag("v:shadow", null, shadata),
-      writextag("v:path", null, { "o:connecttype": "none" }),
-      '<v:textbox><div style="text-align:left"></div></v:textbox>',
-      '<x:ClientData ObjectType="Note">',
-      "<x:MoveWithCells/>",
-      "<x:SizeWithCells/>",
-      /* Part 4 19.4.2.3 Anchor (Anchor) */
-      writetag("x:Anchor", [c.c + 1, 0, c.r + 1, 0, c.c + 3, 20, c.r + 5, 20].join(",")),
-      writetag("x:AutoFill", "False"),
-      writetag("x:Row", String(c.r)),
-      writetag("x:Column", String(c.c)),
-      x[1].hidden ? "" : "<x:Visible/>",
-      "</x:ClientData>",
-      "</v:shape>"
-    ]);
+    o.push(write_vml_comment(x, _shapeid));
   });
   o.push("</xml>");
   return o.join("");
 }
+function write_vml_comment(x, _shapeid, ws) {
+  var c = decode_cell(x[0]);
+  var fillopts = (
+    /*::(*/
+    { "color2": "#BEFF82", "type": "gradient" }
+  );
+  if (fillopts.type == "gradient") fillopts.angle = "-180";
+  var fillparm = fillopts.type == "gradient" ? writextag("o:fill", null, { type: "gradientUnscaled", "v:ext": "view" }) : null;
+  var fillxml = writextag("v:fill", fillparm, fillopts);
+  var shadata = { on: "t", "obscured": "t" };
+  return [
+    "<v:shape" + wxt_helper({
+      id: "_x0000_s" + _shapeid,
+      type: "#_x0000_t202",
+      style: "position:absolute; margin-left:80pt;margin-top:5pt;width:104pt;height:64pt;z-index:10" + (x[1].hidden ? ";visibility:hidden" : ""),
+      fillcolor: "#ECFAD4",
+      strokecolor: "#edeaa1"
+    }) + ">",
+    fillxml,
+    writextag("v:shadow", null, shadata),
+    writextag("v:path", null, { "o:connecttype": "none" }),
+    '<v:textbox><div style="text-align:left"></div></v:textbox>',
+    '<x:ClientData ObjectType="Note">',
+    "<x:MoveWithCells/>",
+    "<x:SizeWithCells/>",
+    /* Part 4 19.4.2.3 Anchor (Anchor) */
+    writetag("x:Anchor", [c.c + 1, 0, c.r + 1, 0, c.c + 3, 20, c.r + 5, 20].join(",")),
+    writetag("x:AutoFill", "False"),
+    writetag("x:Row", String(c.r)),
+    writetag("x:Column", String(c.c)),
+    x[1].hidden ? "" : "<x:Visible/>",
+    "</x:ClientData>",
+    "</v:shape>"
+  ].join("");
+}
 function write_comments_xml(data) {
   var o = [XML_HEADER, writextag("comments", null, { "xmlns": XMLNS_main[0] })];
   var iauthor = [];
@@ -15400,20 +15605,27 @@ function write_comments_xml(data) {
   o.push("</authors>");
   o.push("<commentList>");
   data.forEach(function(d) {
-    var lastauthor = 0, ts = [];
+    var lastauthor = 0, ts = [], tcnt = 0;
     if (d[1][0] && d[1][0].T && d[1][0].ID) lastauthor = iauthor.indexOf("tc=" + d[1][0].ID);
-    else d[1].forEach(function(c) {
+    d[1].forEach(function(c) {
       if (c.a) lastauthor = iauthor.indexOf(escapexml(c.a));
-      ts.push(c.t || "");
+      if (c.T) ++tcnt;
+      ts.push(c.t == null ? "" : escapexml(c.t));
     });
-    o.push('<comment ref="' + d[0] + '" authorId="' + lastauthor + '"><text>');
-    if (ts.length <= 1) o.push(writetag("t", escapexml(ts[0] || "")));
-    else {
+    if (tcnt === 0) {
+      d[1].forEach(function(c) {
+        o.push('<comment ref="' + d[0] + '" authorId="' + iauthor.indexOf(escapexml(c.a)) + '"><text>');
+        o.push(writetag("t", c.t == null ? "" : escapexml(c.t)));
+        o.push("</text></comment>");
+      });
+    } else {
+      if (d[1][0] && d[1][0].T && d[1][0].ID) lastauthor = iauthor.indexOf("tc=" + d[1][0].ID);
+      o.push('<comment ref="' + d[0] + '" authorId="' + lastauthor + '"><text>');
       var t = "Comment:\n    " + ts[0] + "\n";
       for (var i = 1; i < ts.length; ++i) t += "Reply:\n    " + ts[i] + "\n";
       o.push(writetag("t", escapexml(t)));
+      o.push("</text></comment>");
     }
-    o.push("</text></comment>");
   });
   o.push("</commentList>");
   if (o.length > 2) {
@@ -15463,6 +15675,11 @@ function write_people_xml(people) {
   return o.join("");
 }
 var VBAFMTS = ["xlsb", "xlsm", "xlam", "biff8", "xla"];
+var crefregex = /(^|[^._A-Z0-9])(\$?)([A-Z]{1,2}|[A-W][A-Z]{2}|X[A-E][A-Z]|XF[A-D])(\$?)(\d{1,7})(?![_.\(A-Za-z0-9])/g;
+try {
+  crefregex = /(^|[^._A-Z0-9])([$]?)([A-Z]{1,2}|[A-W][A-Z]{2}|X[A-E][A-Z]|XF[A-D])([$]?)(10[0-3]\d{4}|104[0-7]\d{3}|1048[0-4]\d{2}|10485[0-6]\d|104857[0-6]|[1-9]\d{0,5})(?![_.\(A-Za-z0-9])/g;
+} catch (e) {
+}
 var browser_has_Map = typeof Map !== "undefined";
 function get_sst_id(sst, str, rev) {
   var i = 0, len = sst.length;
@@ -15528,7 +15745,7 @@ function get_cell_style(styles, cell, opts) {
   var i = 60, len = styles.length;
   if (z == null && opts.ssf) {
     for (; i < 392; ++i) if (opts.ssf[i] == null) {
-      SSF_load(cell.z, i);
+      SSF__load(cell.z, i);
       opts.ssf[i] = cell.z;
       opts.revssf[cell.z] = z = i;
       break;
@@ -15630,7 +15847,7 @@ function write_ws_xml_autofilter(data, ws, wb, idx) {
     var name = names[i];
     if (name.Name != "_xlnm._FilterDatabase") continue;
     if (name.Sheet != idx) continue;
-    name.Ref = "'" + wb.SheetNames[idx] + "'!" + ref2;
+    name.Ref = formula_quote_sheet_name(wb.SheetNames[idx]) + "!" + fix_range(ref2);
     break;
   }
   if (i == names.length) names.push({ Name: "_xlnm._FilterDatabase", Sheet: idx, Ref: "'" + wb.SheetNames[idx] + "'!" + ref2 });
@@ -15641,9 +15858,9 @@ function write_ws_xml_sheetviews(ws, opts, idx, wb) {
   if ((((wb || {}).Workbook || {}).Views || [])[0]) sview.rightToLeft = wb.Workbook.Views[0].RTL ? "1" : "0";
   return writextag("sheetViews", writextag("sheetView", null, sview), {});
 }
-function write_ws_xml_cell(cell, ref2, ws, opts) {
+function write_ws_xml_cell(cell, ref2, ws, opts, idx, wb, date1904) {
   if (cell.c) ws["!comments"].push([ref2, cell.c]);
-  if (cell.v === void 0 && typeof cell.f !== "string" || cell.t === "z" && !cell.f) return "";
+  if ((cell.v === void 0 || cell.t === "z" && !(opts || {}).sheetStubs) && typeof cell.f !== "string" && typeof cell.z == "undefined") return "";
   var vv = "";
   var oldt = cell.t, oldv = cell.v;
   if (cell.t !== "z") switch (cell.t) {
@@ -15651,17 +15868,26 @@ function write_ws_xml_cell(cell, ref2, ws, opts) {
       vv = cell.v ? "1" : "0";
       break;
     case "n":
-      vv = "" + cell.v;
+      if (isNaN(cell.v)) {
+        cell.t = "e";
+        vv = BErr[cell.v = 36];
+      } else if (!isFinite(cell.v)) {
+        cell.t = "e";
+        vv = BErr[cell.v = 7];
+      } else vv = "" + cell.v;
       break;
     case "e":
       vv = BErr[cell.v];
       break;
     case "d":
-      if (opts && opts.cellDates) vv = parseDate(cell.v, -1).toISOString();
-      else {
+      if (opts && opts.cellDates) {
+        var _vv = parseDate(cell.v, date1904);
+        vv = _vv.toISOString();
+        if (_vv.getUTCFullYear() < 1900) vv = vv.slice(vv.indexOf("T") + 1).replace("Z", "");
+      } else {
         cell = dup(cell);
         cell.t = "n";
-        vv = "" + (cell.v = datenum(parseDate(cell.v)));
+        vv = "" + (cell.v = datenum(parseDate(cell.v, date1904), date1904));
       }
       if (typeof cell.z === "undefined") cell.z = table_fmt[14];
       break;
@@ -15669,7 +15895,7 @@ function write_ws_xml_cell(cell, ref2, ws, opts) {
       vv = cell.v;
       break;
   }
-  var v = writetag("v", escapexml(vv)), o = { r: ref2 };
+  var v = cell.t == "z" || cell.v == null ? "" : writetag("v", escapexml(vv)), o = { r: ref2 };
   var os = get_cell_style(opts.cellXfs, cell, opts);
   if (os !== 0) o.s = os;
   switch (cell.t) {
@@ -15696,8 +15922,7 @@ function write_ws_xml_cell(cell, ref2, ws, opts) {
         v = writetag("v", "" + get_sst_id(opts.Strings, cell.v, opts.revStrings));
         o.t = "s";
         break;
-      }
-      o.t = "str";
+      } else o.t = "str";
       break;
   }
   if (cell.t != oldt) {
@@ -15708,23 +15933,28 @@ function write_ws_xml_cell(cell, ref2, ws, opts) {
     var ff = cell.F && cell.F.slice(0, ref2.length) == ref2 ? { t: "array", ref: cell.F } : null;
     v = writextag("f", escapexml(cell.f), ff) + (cell.v != null ? v : "");
   }
-  if (cell.l) ws["!links"].push([ref2, cell.l]);
+  if (cell.l) {
+    cell.l.display = escapexml(vv);
+    ws["!links"].push([ref2, cell.l]);
+  }
   if (cell.D) o.cm = 1;
   return writextag("c", v, o);
 }
 function write_ws_xml_data(ws, opts, idx, wb) {
   var o = [], r = [], range2 = safe_decode_range(ws["!ref"]), cell = "", ref2, rr = "", cols = [], R = 0, C = 0, rows = ws["!rows"];
-  var dense = Array.isArray(ws);
+  var dense = ws["!data"] != null, data = dense ? ws["!data"] : [];
   var params = { r: rr }, row, height = -1;
+  var date1904 = (((wb || {}).Workbook || {}).WBProps || {}).date1904;
   for (C = range2.s.c; C <= range2.e.c; ++C) cols[C] = encode_col(C);
   for (R = range2.s.r; R <= range2.e.r; ++R) {
     r = [];
     rr = encode_row(R);
+    var data_R = dense ? data[R] : [];
     for (C = range2.s.c; C <= range2.e.c; ++C) {
       ref2 = cols[C] + rr;
-      var _cell = dense ? (ws[R] || [])[C] : ws[ref2];
+      var _cell = dense ? data_R[C] : ws[ref2];
       if (_cell === void 0) continue;
-      if ((cell = write_ws_xml_cell(_cell, ref2, ws, opts)) != null) r.push(cell);
+      if ((cell = write_ws_xml_cell(_cell, ref2, ws, opts, idx, wb, date1904)) != null) r.push(cell);
     }
     if (r.length > 0 || rows && rows[R]) {
       params = { r: rr };
@@ -15796,7 +16026,7 @@ function write_ws_xml(idx, opts, wb, rels) {
   o[sidx = o.length] = "<sheetData/>";
   ws["!links"] = [];
   if (ws["!ref"] != null) {
-    rdata = write_ws_xml_data(ws, opts);
+    rdata = write_ws_xml_data(ws, opts, idx, wb);
     if (rdata.length > 0) o[o.length] = rdata;
   }
   if (o.length > sidx + 1) {
@@ -15816,11 +16046,12 @@ function write_ws_xml(idx, opts, wb, rels) {
       if (!l[1].Target) return;
       rel = { "ref": l[0] };
       if (l[1].Target.charAt(0) != "#") {
-        rId = add_rels(rels, -1, escapexml(l[1].Target).replace(/#.*$/, ""), RELS.HLINK);
+        rId = add_rels(rels, -1, escapexml(l[1].Target).replace(/#[\s\S]*$/, ""), RELS.HLINK);
         rel["r:id"] = "rId" + rId;
       }
       if ((relc = l[1].Target.indexOf("#")) > -1) rel.location = escapexml(l[1].Target.slice(relc + 1));
       if (l[1].Tooltip) rel.tooltip = escapexml(l[1].Tooltip);
+      rel.display = l[1].display;
       o[o.length] = writextag("hyperlink", null, rel);
     });
     o[o.length] = "</hyperlinks>";
@@ -15864,17 +16095,21 @@ var WBPropsDef = [
   ["showPivotChartFilter", false, "bool"],
   ["updateLinks", "userSet"]
 ];
-var badchars = /* @__PURE__ */ "][*?/\\".split("");
+var badchars = /* @__PURE__ */ ":][*?/\\".split("");
 function check_ws_name(n, safe) {
-  if (n.length > 31) {
-    throw new Error("Sheet names cannot exceed 31 chars");
+  try {
+    if (n == "") throw new Error("Sheet name cannot be blank");
+    if (n.length > 31) throw new Error("Sheet name cannot exceed 31 chars");
+    if (n.charCodeAt(0) == 39 || n.charCodeAt(n.length - 1) == 39) throw new Error("Sheet name cannot start or end with apostrophe (')");
+    if (n.toLowerCase() == "history") throw new Error("Sheet name cannot be 'History'");
+    badchars.forEach(function(c) {
+      if (n.indexOf(c) == -1) return;
+      throw new Error("Sheet name cannot contain : \\ / ? * [ ]");
+    });
+  } catch (e) {
+    throw e;
   }
-  var _good = true;
-  badchars.forEach(function(c) {
-    if (n.indexOf(c) == -1) return;
-    throw new Error("Sheet name cannot contain : \\ / ? * [ ]");
-  });
-  return _good;
+  return true;
 }
 function check_wb_names(N, S, codes) {
   N.forEach(function(n, i) {
@@ -15892,6 +16127,19 @@ function check_wb(wb) {
   var Sheets = wb.Workbook && wb.Workbook.Sheets || [];
   check_wb_names(wb.SheetNames, Sheets, !!wb.vbaraw);
   for (var i = 0; i < wb.SheetNames.length; ++i) check_ws(wb.Sheets[wb.SheetNames[i]], wb.SheetNames[i], i);
+  wb.SheetNames.forEach(function(n, i2) {
+    var ws = wb.Sheets[n];
+    if (!ws || !ws["!autofilter"]) return;
+    var DN;
+    if (!wb.Workbook) wb.Workbook = {};
+    if (!wb.Workbook.Names) wb.Workbook.Names = [];
+    wb.Workbook.Names.forEach(function(dn) {
+      if (dn.Name == "_xlnm._FilterDatabase" && dn.Sheet == i2) DN = dn;
+    });
+    var nn = formula_quote_sheet_name(n) + "!" + fix_range(ws["!autofilter"].ref);
+    if (DN) DN.Ref = nn;
+    else wb.Workbook.Names.push({ Name: "_xlnm._FilterDatabase", Sheet: i2, Ref: nn });
+  });
 }
 function write_wb_xml(wb) {
   var o = [XML_HEADER];
@@ -15964,6 +16212,8 @@ function write_wb_xml(wb) {
 function make_html_row(ws, r, R, o) {
   var M = ws["!merges"] || [];
   var oo = [];
+  var sp = {};
+  var dense = ws["!data"] != null;
   for (var C = r.s.c; C <= r.e.c; ++C) {
     var RS = 0, CS = 0;
     for (var j = 0; j < M.length; ++j) {
@@ -15978,18 +16228,22 @@ function make_html_row(ws, r, R, o) {
       break;
     }
     if (RS < 0) continue;
-    var coord = encode_cell({ r: R, c: C });
-    var cell = o.dense ? (ws[R] || [])[C] : ws[coord];
+    var coord = encode_col(C) + encode_row(R);
+    var cell = dense ? (ws["!data"][R] || [])[C] : ws[coord];
+    if (cell && cell.t == "n" && cell.v != null && !isFinite(cell.v)) {
+      if (isNaN(cell.v)) cell = { t: "e", v: 36, w: BErr[36] };
+      else cell = { t: "e", v: 7, w: BErr[7] };
+    }
     var w = cell && cell.v != null && (cell.h || escapehtml(cell.w || (format_cell(cell), cell.w) || "")) || "";
-    var sp = {};
+    sp = {};
     if (RS > 1) sp.rowspan = RS;
     if (CS > 1) sp.colspan = CS;
     if (o.editable) w = '<span contenteditable="true">' + w + "</span>";
     else if (cell) {
       sp["data-t"] = cell && cell.t || "z";
-      if (cell.v != null) sp["data-v"] = cell.v;
+      if (cell.v != null) sp["data-v"] = escapehtml(cell.v instanceof Date ? cell.v.toISOString() : cell.v);
       if (cell.z != null) sp["data-z"] = cell.z;
-      if (cell.l && (cell.l.Target || "#").charAt(0) != "#") w = '<a href="' + cell.l.Target + '">' + w + "</a>";
+      if (cell.l && (cell.l.Target || "#").charAt(0) != "#") w = '<a href="' + escapehtml(cell.l.Target) + '">' + w + "</a>";
     }
     sp.id = (o.id || "sjs") + "-" + coord;
     oo.push(writextag("td", w, sp));
@@ -16008,15 +16262,19 @@ function sheet_to_html(ws, opts) {
   var header = o.header != null ? o.header : HTML_BEGIN;
   var footer = o.footer != null ? o.footer : HTML_END;
   var out = [header];
-  var r = decode_range(ws["!ref"]);
-  o.dense = Array.isArray(ws);
+  var r = decode_range(ws["!ref"] || "A1");
   out.push(make_html_preamble(ws, r, o));
-  for (var R = r.s.r; R <= r.e.r; ++R) out.push(make_html_row(ws, r, R, o));
+  if (ws["!ref"]) for (var R = r.s.r; R <= r.e.r; ++R) out.push(make_html_row(ws, r, R, o));
   out.push("</table>" + footer);
   return out.join("");
 }
 function sheet_add_dom(ws, table, _opts) {
+  var rows = table.rows;
+  if (!rows) {
+    throw "Unsupported origin when " + table.tagName + " is not a TABLE";
+  }
   var opts = _opts || {};
+  var dense = ws["!data"] != null;
   var or_R = 0, or_C = 0;
   if (opts.origin != null) {
     if (typeof opts.origin == "number") or_R = opts.origin;
@@ -16026,7 +16284,6 @@ function sheet_add_dom(ws, table, _opts) {
       or_C = _origin.c;
     }
   }
-  var rows = table.getElementsByTagName("tr");
   var sheetRows = Math.min(opts.sheetRows || 1e7, rows.length);
   var range2 = { s: { r: 0, c: 0 }, e: { r: or_R, c: or_C } };
   if (ws["!ref"]) {
@@ -16047,7 +16304,7 @@ function sheet_add_dom(ws, table, _opts) {
       if (opts.display) continue;
       rowinfo[R] = { hidden: true };
     }
-    var elts = row.children;
+    var elts = row.cells;
     for (_C = C = 0; _C < elts.length; ++_C) {
       var elt = elts[_C];
       if (opts.display && is_dom_element_hidden(elt)) continue;
@@ -16067,14 +16324,16 @@ function sheet_add_dom(ws, table, _opts) {
       if (v != null) {
         if (v.length == 0) o.t = _t || "z";
         else if (opts.raw || v.trim().length == 0 || _t == "s") ;
+        else if (_t == "e" && BErr[+v]) o = { t: "e", v: +v, w: BErr[+v] };
         else if (v === "TRUE") o = { t: "b", v: true };
         else if (v === "FALSE") o = { t: "b", v: false };
         else if (!isNaN(fuzzynum(v))) o = { t: "n", v: fuzzynum(v) };
         else if (!isNaN(fuzzydate(v).getDate())) {
           o = { t: "d", v: parseDate(v) };
+          if (opts.UTC) o.v = local_to_utc(o.v);
           if (!opts.cellDates) o = { t: "n", v: datenum(o.v) };
           o.z = opts.dateNF || table_fmt[14];
-        }
+        } else if (v.charCodeAt(0) == 35 && RBErr[v] != null) o = { t: "e", v: RBErr[v], w: v };
       }
       if (o.z === void 0 && z != null) o.z = z;
       var l = "", Aelts = elt.getElementsByTagName("A");
@@ -16084,10 +16343,10 @@ function sheet_add_dom(ws, table, _opts) {
           if (l.charAt(0) != "#") break;
         }
       }
-      if (l && l.charAt(0) != "#") o.l = { Target: l };
-      if (opts.dense) {
-        if (!ws[R + or_R]) ws[R + or_R] = [];
-        ws[R + or_R][C + or_C] = o;
+      if (l && l.charAt(0) != "#" && l.slice(0, 11).toLowerCase() != "javascript:") o.l = { Target: l };
+      if (dense) {
+        if (!ws["!data"][R + or_R]) ws["!data"][R + or_R] = [];
+        ws["!data"][R + or_R][C + or_C] = o;
       } else ws[encode_cell({ c: C + or_C, r: R + or_R })] = o;
       if (range2.e.c < C + or_C) range2.e.c = C + or_C;
       C += CS;
@@ -16102,11 +16361,13 @@ function sheet_add_dom(ws, table, _opts) {
 }
 function parse_dom_table(table, _opts) {
   var opts = _opts || {};
-  var ws = opts.dense ? [] : {};
+  var ws = {};
+  if (opts.dense) ws["!data"] = [];
   return sheet_add_dom(ws, table, _opts);
 }
 function table_to_book(table, opts) {
-  return sheet_to_workbook(parse_dom_table(table, opts), opts);
+  var o = sheet_to_workbook(parse_dom_table(table, opts), opts);
+  return o;
 }
 function is_dom_element_hidden(element) {
   var display = "";
@@ -16120,6 +16381,25 @@ function get_get_computed_style_function(element) {
   if (typeof getComputedStyle === "function") return getComputedStyle;
   return null;
 }
+/*! sheetjs (C) 2013-present SheetJS -- http://sheetjs.com */
+(function() {
+  try {
+    if (typeof Uint8Array == "undefined")
+      return "slice";
+    if (typeof Uint8Array.prototype.subarray == "undefined")
+      return "slice";
+    if (typeof Buffer !== "undefined") {
+      if (typeof Buffer.prototype.subarray == "undefined")
+        return "slice";
+      if ((typeof Buffer.from == "function" ? Buffer.from([72, 62]) : new Buffer([72, 62])) instanceof Uint8Array)
+        return "subarray";
+      return "slice";
+    }
+    return "subarray";
+  } catch (e) {
+    return "slice";
+  }
+})();
 function fix_opts_func(defaults) {
   return function fix_opts(opts) {
     for (var i = 0; i != defaults.length; ++i) {
@@ -16144,7 +16424,6 @@ function fix_write_opts(opts) {
   ])(opts);
 }
 function write_zip_xlsx(wb, opts) {
-  _shapeid = 1024;
   if (wb && !wb.SSF) {
     wb.SSF = dup(table_fmt);
   }
@@ -16226,10 +16505,10 @@ function write_zip_xlsx(wb, opts) {
           });
         });
         if (needtc) {
-          cf = "xl/threadedComments/threadedComment" + rId + "." + wbext;
+          cf = "xl/threadedComments/threadedComment" + rId + ".xml";
           zip_add_file(zip, cf, write_tcmnt_xml(comments, people, opts));
           ct.threadedcomments.push(cf);
-          add_rels(wsrels, -1, "../threadedComments/threadedComment" + rId + "." + wbext, RELS.TCMNT);
+          add_rels(wsrels, -1, "../threadedComments/threadedComment" + rId + ".xml", RELS.TCMNT);
         }
         cf = "xl/comments" + rId + "." + wbext;
         zip_add_file(zip, cf, write_comments_xml(comments));
@@ -16238,7 +16517,7 @@ function write_zip_xlsx(wb, opts) {
         need_vml = true;
       }
       if (ws["!legacy"]) {
-        if (need_vml) zip_add_file(zip, "xl/drawings/vmlDrawing" + rId + ".vml", write_comments_vml(rId, ws["!comments"]));
+        if (need_vml) zip_add_file(zip, "xl/drawings/vmlDrawing" + rId + ".vml", write_vml(rId, ws["!comments"]));
       }
       delete ws["!comments"];
       delete ws["!legacy"];
@@ -16363,10 +16642,10 @@ function writeSyncXLSX(wb, opts) {
   }
   return write_zip_typeXLSX(wb, o);
 }
-function make_json_row(sheet, r, R, cols, header, hdr, dense, o) {
+function make_json_row(sheet, r, R, cols, header, hdr, o) {
   var rr = encode_row(R);
   var defval = o.defval, raw = o.raw || !Object.prototype.hasOwnProperty.call(o, "raw");
-  var isempty = true;
+  var isempty = true, dense = sheet["!data"] != null;
   var row = header === 1 ? [] : {};
   if (header !== 1) {
     if (Object.defineProperty) try {
@@ -16376,9 +16655,9 @@ function make_json_row(sheet, r, R, cols, header, hdr, dense, o) {
     }
     else row.__rowNum__ = R;
   }
-  if (!dense || sheet[R]) for (var C = r.s.c; C <= r.e.c; ++C) {
-    var val = dense ? sheet[R][C] : sheet[cols[C] + rr];
-    if (val === void 0 || val.t === void 0) {
+  if (!dense || sheet["!data"][R]) for (var C = r.s.c; C <= r.e.c; ++C) {
+    var val = dense ? (sheet["!data"][R] || [])[C] : sheet[cols[C] + rr];
+    if (val == null || val.t === void 0) {
       if (defval === void 0) continue;
       if (hdr[C] != null) {
         row[hdr[C]] = defval;
@@ -16394,9 +16673,14 @@ function make_json_row(sheet, r, R, cols, header, hdr, dense, o) {
         v = v == 0 ? null : void 0;
         break;
       case "s":
-      case "d":
       case "b":
       case "n":
+        if (!val.z || !fmt_is_date(val.z)) break;
+        v = numdate(v);
+        if (typeof v == "number") break;
+      /* falls through */
+      case "d":
+        if (!(o && (o.UTC || o.raw === false))) v = utc_to_local(new Date(v));
         break;
       default:
         throw new Error("unrecognized type " + val.t);
@@ -16408,7 +16692,7 @@ function make_json_row(sheet, r, R, cols, header, hdr, dense, o) {
         else if (raw && v === null) row[hdr[C]] = null;
         else continue;
       } else {
-        row[hdr[C]] = raw && (val.t !== "n" || val.t === "n" && o.rawNumbers !== false) ? v : format_cell(val, v, o);
+        row[hdr[C]] = (val.t === "n" && typeof o.rawNumbers === "boolean" ? o.rawNumbers : raw) ? v : format_cell(val, v, o);
       }
       if (v != null) isempty = false;
     }
@@ -16441,16 +16725,16 @@ function sheet_to_json(sheet, opts) {
   var cols = [];
   var out = [];
   var outi = 0, counter = 0;
-  var dense = Array.isArray(sheet);
+  var dense = sheet["!data"] != null;
   var R = r.s.r, C = 0;
   var header_cnt = {};
-  if (dense && !sheet[R]) sheet[R] = [];
+  if (dense && !sheet["!data"][R]) sheet["!data"][R] = [];
   var colinfo = o.skipHidden && sheet["!cols"] || [];
   var rowinfo = o.skipHidden && sheet["!rows"] || [];
   for (C = r.s.c; C <= r.e.c; ++C) {
     if ((colinfo[C] || {}).hidden) continue;
     cols[C] = encode_col(C);
-    val = dense ? sheet[R][C] : sheet[cols[C] + rr];
+    val = dense ? sheet["!data"][R][C] : sheet[cols[C] + rr];
     switch (header) {
       case 1:
         hdr[C] = C - r.s.c;
@@ -16478,19 +16762,21 @@ function sheet_to_json(sheet, opts) {
   }
   for (R = r.s.r + offset; R <= r.e.r; ++R) {
     if ((rowinfo[R] || {}).hidden) continue;
-    var row = make_json_row(sheet, r, R, cols, header, hdr, dense, o);
+    var row = make_json_row(sheet, r, R, cols, header, hdr, o);
     if (row.isempty === false || (header === 1 ? o.blankrows !== false : !!o.blankrows)) out[outi++] = row.row;
   }
   out.length = outi;
   return out;
 }
 var qreg = /"/g;
-function make_csv_row(sheet, r, R, cols, fs, rs, FS, o) {
+function make_csv_row(sheet, r, R, cols, fs, rs, FS, w, o) {
   var isempty = true;
   var row = [], txt = "", rr = encode_row(R);
+  var dense = sheet["!data"] != null;
+  var datarow = dense && sheet["!data"][R] || [];
   for (var C = r.s.c; C <= r.e.c; ++C) {
     if (!cols[C]) continue;
-    var val = o.dense ? (sheet[R] || [])[C] : sheet[cols[C] + rr];
+    var val = dense ? datarow[C] : sheet[cols[C] + rr];
     if (val == null) txt = "";
     else if (val.v != null) {
       isempty = false;
@@ -16499,7 +16785,7 @@ function make_csv_row(sheet, r, R, cols, fs, rs, FS, o) {
         txt = '"' + txt.replace(qreg, '""') + '"';
         break;
       }
-      if (txt == "ID") txt = '"ID"';
+      if (txt == "ID" && w == 0 && row.length == 0) txt = '"ID"';
     } else if (val.f != null && !val.F) {
       isempty = false;
       txt = "=" + val.f;
@@ -16507,6 +16793,7 @@ function make_csv_row(sheet, r, R, cols, fs, rs, FS, o) {
     } else txt = "";
     row.push(txt);
   }
+  if (o.strip) while (row[row.length - 1] === "") --row.length;
   if (o.blankrows === false && isempty) return null;
   return row.join(FS);
 }
@@ -16517,23 +16804,19 @@ function sheet_to_csv(sheet, opts) {
   var r = safe_decode_range(sheet["!ref"]);
   var FS = o.FS !== void 0 ? o.FS : ",", fs = FS.charCodeAt(0);
   var RS = o.RS !== void 0 ? o.RS : "\n", rs = RS.charCodeAt(0);
-  var endregex = new RegExp((FS == "|" ? "\\|" : FS) + "+$");
   var row = "", cols = [];
-  o.dense = Array.isArray(sheet);
   var colinfo = o.skipHidden && sheet["!cols"] || [];
   var rowinfo = o.skipHidden && sheet["!rows"] || [];
   for (var C = r.s.c; C <= r.e.c; ++C) if (!(colinfo[C] || {}).hidden) cols[C] = encode_col(C);
   var w = 0;
   for (var R = r.s.r; R <= r.e.r; ++R) {
     if ((rowinfo[R] || {}).hidden) continue;
-    row = make_csv_row(sheet, r, R, cols, fs, rs, FS, o);
+    row = make_csv_row(sheet, r, R, cols, fs, rs, FS, w, o);
     if (row == null) {
       continue;
     }
-    if (o.strip) row = row.replace(endregex, "");
     if (row || o.blankrows !== false) out.push((w++ ? RS : "") + row);
   }
-  delete o.dense;
   return out.join("");
 }
 function sheet_to_txt(sheet, opts) {
@@ -16543,18 +16826,18 @@ function sheet_to_txt(sheet, opts) {
   var s = sheet_to_csv(sheet, opts);
   return s;
 }
-function sheet_to_formulae(sheet) {
+function sheet_to_formulae(sheet, opts) {
   var y = "", x, val = "";
   if (sheet == null || sheet["!ref"] == null) return [];
   var r = safe_decode_range(sheet["!ref"]), rr = "", cols = [], C;
   var cmds = [];
-  var dense = Array.isArray(sheet);
+  var dense = sheet["!data"] != null;
   for (C = r.s.c; C <= r.e.c; ++C) cols[C] = encode_col(C);
   for (var R = r.s.r; R <= r.e.r; ++R) {
     rr = encode_row(R);
     for (C = r.s.c; C <= r.e.c; ++C) {
       y = cols[C] + rr;
-      x = dense ? (sheet[R] || [])[C] : sheet[y];
+      x = dense ? (sheet["!data"][R] || [])[C] : sheet[y];
       val = "";
       if (x === void 0) continue;
       else if (x.F != null) {
@@ -16564,6 +16847,7 @@ function sheet_to_formulae(sheet) {
         if (y.indexOf(":") == -1) y = y + ":" + y;
       }
       if (x.f != null) val = x.f;
+      else if (opts && opts.values === false) continue;
       else if (x.t == "z") continue;
       else if (x.t == "n" && x.v != null) val = "" + x.v;
       else if (x.t == "b") val = x.v ? "TRUE" : "FALSE";
@@ -16578,8 +16862,10 @@ function sheet_to_formulae(sheet) {
 }
 function sheet_add_json(_ws, js, opts) {
   var o = opts || {};
+  var dense = _ws ? _ws["!data"] != null : o.dense;
   var offset = +!o.skipHeader;
   var ws = _ws || {};
+  if (!_ws && dense) ws["!data"] = [];
   var _R = 0, _C = 0;
   if (ws && o.origin != null) {
     if (typeof o.origin == "number") _R = o.origin;
@@ -16589,7 +16875,6 @@ function sheet_add_json(_ws, js, opts) {
       _C = _origin.c;
     }
   }
-  var cell;
   var range2 = { s: { c: 0, r: 0 }, e: { c: _C, r: _R + js.length - 1 + offset } };
   if (ws["!ref"]) {
     var _range = safe_decode_range(ws["!ref"]);
@@ -16606,33 +16891,40 @@ function sheet_add_json(_ws, js, opts) {
     }
   }
   var hdr = o.header || [], C = 0;
+  var ROW = [];
   js.forEach(function(JS, R) {
+    if (dense && !ws["!data"][_R + R + offset]) ws["!data"][_R + R + offset] = [];
+    if (dense) ROW = ws["!data"][_R + R + offset];
     keys(JS).forEach(function(k) {
       if ((C = hdr.indexOf(k)) == -1) hdr[C = hdr.length] = k;
       var v = JS[k];
       var t = "z";
       var z = "";
-      var ref2 = encode_cell({ c: _C + C, r: _R + R + offset });
-      cell = ws_get_cell_stub(ws, ref2);
+      var ref2 = dense ? "" : encode_col(_C + C) + encode_row(_R + R + offset);
+      var cell = dense ? ROW[_C + C] : ws[ref2];
       if (v && typeof v === "object" && !(v instanceof Date)) {
-        ws[ref2] = v;
+        if (dense) ROW[_C + C] = v;
+        else ws[ref2] = v;
       } else {
         if (typeof v == "number") t = "n";
         else if (typeof v == "boolean") t = "b";
         else if (typeof v == "string") t = "s";
         else if (v instanceof Date) {
           t = "d";
+          if (!o.UTC) v = local_to_utc(v);
           if (!o.cellDates) {
             t = "n";
             v = datenum(v);
           }
-          z = o.dateNF || table_fmt[14];
+          z = cell != null && cell.z && fmt_is_date(cell.z) ? cell.z : o.dateNF || table_fmt[14];
         } else if (v === null && o.nullError) {
           t = "e";
           v = 0;
         }
-        if (!cell) ws[ref2] = cell = { t, v };
-        else {
+        if (!cell) {
+          if (!dense) ws[ref2] = cell = { t, v };
+          else ROW[_C + C] = cell = { t, v };
+        } else {
           cell.t = t;
           cell.v = v;
           delete cell.w;
@@ -16645,7 +16937,11 @@ function sheet_add_json(_ws, js, opts) {
   });
   range2.e.c = Math.max(range2.e.c, _C + hdr.length - 1);
   var __R = encode_row(_R);
-  if (offset) for (C = 0; C < hdr.length; ++C) ws[encode_col(C + _C) + __R] = { t: "s", v: hdr[C] };
+  if (dense && !ws["!data"][_R]) ws["!data"][_R] = [];
+  if (offset) for (C = 0; C < hdr.length; ++C) {
+    if (dense) ws["!data"][_R][C + _C] = { t: "s", v: hdr[C] };
+    else ws[encode_col(C + _C) + __R] = { t: "s", v: hdr[C] };
+  }
   ws["!ref"] = encode_range(range2);
   return ws;
 }
@@ -16654,15 +16950,15 @@ function json_to_sheet(js, opts) {
 }
 function ws_get_cell_stub(ws, R, C) {
   if (typeof R == "string") {
-    if (Array.isArray(ws)) {
+    if (ws["!data"] != null) {
       var RC = decode_cell(R);
-      if (!ws[RC.r]) ws[RC.r] = [];
-      return ws[RC.r][RC.c] || (ws[RC.r][RC.c] = { t: "z" });
+      if (!ws["!data"][RC.r]) ws["!data"][RC.r] = [];
+      return ws["!data"][RC.r][RC.c] || (ws["!data"][RC.r][RC.c] = { t: "z" });
     }
     return ws[R] || (ws[R] = { t: "z" });
   }
   if (typeof R != "number") return ws_get_cell_stub(ws, encode_cell(R));
-  return ws_get_cell_stub(ws, encode_cell({ r: R, c: C || 0 }));
+  return ws_get_cell_stub(ws, encode_col(C || 0) + encode_row(R));
 }
 function wb_sheet_idx(wb, sh) {
   if (typeof sh == "number") {
@@ -16674,8 +16970,10 @@ function wb_sheet_idx(wb, sh) {
     throw new Error("Cannot find sheet name |" + sh + "|");
   } else throw new Error("Cannot find sheet |" + sh + "|");
 }
-function book_new() {
-  return { SheetNames: [], Sheets: {} };
+function book_new(ws, wsname) {
+  var wb = { SheetNames: [], Sheets: {} };
+  if (ws) book_append_sheet(wb, ws, wsname || "Sheet1");
+  return wb;
 }
 function book_append_sheet(wb, ws, name, roll) {
   var i = 1;
@@ -16683,10 +16981,10 @@ function book_append_sheet(wb, ws, name, roll) {
     for (; i <= 65535; ++i, name = void 0) if (wb.SheetNames.indexOf(name = "Sheet" + i) == -1) break;
   }
   if (!name || wb.SheetNames.length >= 65535) throw new Error("Too many worksheets");
-  if (roll && wb.SheetNames.indexOf(name) >= 0) {
-    var m = name.match(/(^.*?)(\d+)$/);
-    i = m && +m[2] || 0;
-    var root = m && m[1] || name;
+  if (roll && wb.SheetNames.indexOf(name) >= 0 && name.length < 32) {
+    var m = name.match(/\d+$/);
+    i = m && +m[0] || 0;
+    var root = m && name.slice(0, m.index) || name;
     for (++i; i <= 65535; ++i) if (wb.SheetNames.indexOf(name = root + i) == -1) break;
   }
   check_ws_name(name);
@@ -16743,6 +17041,12 @@ function sheet_set_array_formula(ws, range2, formula, dynamic) {
       if (dynamic) cell.D = true;
     }
   }
+  var wsr = decode_range(ws["!ref"]);
+  if (wsr.s.r > rng.s.r) wsr.s.r = rng.s.r;
+  if (wsr.s.c > rng.s.c) wsr.s.c = rng.s.c;
+  if (wsr.e.r < rng.e.r) wsr.e.r = rng.e.r;
+  if (wsr.e.c < rng.e.c) wsr.e.c = rng.e.c;
+  ws["!ref"] = encode_range(wsr);
   return ws;
 }
 var utils$1 = {
@@ -16756,6 +17060,7 @@ var utils$1 = {
   decode_cell,
   decode_range,
   format_cell,
+  sheet_new,
   sheet_add_aoa,
   sheet_add_json,
   sheet_add_dom,
@@ -16956,7 +17261,7 @@ class BarSeries extends XmlComponent {
       errorBars,
       categories,
       values,
-      shape,
+      shapeFmt,
       extensionList
     } = _l, options = __objRest(_l, [
       "invertIfNegative",
@@ -16967,7 +17272,7 @@ class BarSeries extends XmlComponent {
       "errorBars",
       "categories",
       "values",
-      "shape",
+      "shapeFmt",
       "extensionList"
     ]);
     super("c:ser");
@@ -17010,8 +17315,8 @@ class BarSeries extends XmlComponent {
         })
       );
     }
-    if (shape) {
-      this.root.push(new StringEnumValueElement("c:shape", shape, ""));
+    if (shapeFmt) {
+      this.root.push(new StringEnumValueElement("c:shape", shapeFmt, ""));
     }
     if (extensionList) {
       this.root.push(new ExtensionList(extensionList));
@@ -29485,7 +29790,7 @@ const patchDocument = (_0) => __async(null, [_0], function* ({
         relationshipAdditions.push({
           key,
           entries: chartEntries.map(([tempId], index) => ({
-            name: `chart${index + 1}`,
+            name: `chart${index + 1}.xml`,
             path: "charts",
             type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart",
             repl: tempId