@forevka/wordcanvas 0.7.0 → 0.7.1

package/dist-lib/{browser-5Sv4CuNy.js → browser-DkKxreJM.js}

@@ -1,11 +1,11 @@
-const Le = [
+const je = [
   "header",
   "footer",
   "headerFirst",
   "headerEven",
   "footerFirst",
   "footerEven"
-], er = new Intl.Segmenter(void 0, { granularity: "grapheme" }), rr = new Intl.Segmenter(void 0, { granularity: "word" }), Lr = (r) => r.runs.some((e) => e.text.length > 0) && r.runs.every((e) => e.text.length === 0 || e.style.hidden === !0), Be = (r, e) => {
+], er = new Intl.Segmenter(void 0, { granularity: "grapheme" }), rr = new Intl.Segmenter(void 0, { granularity: "word" }), jr = (r) => r.runs.some((e) => e.text.length > 0) && r.runs.every((e) => e.text.length === 0 || e.style.hidden === !0), Be = (r, e) => {
   const n = [];
   for (const t of r)
     if (t.kind === "paragraph") n.push(t);
@@ -13,11 +13,11 @@ const Le = [
       for (const s of t.rows)
         for (const o of s.cells) n.push(...Be(o.blocks, e));
   return n;
-}, vr = (r, e) => Be(r.section[e] ?? [], !0), qr = (r) => Be(r.blocks, !0), nr = (r) => [
+}, hr = (r, e) => Be(r.section[e] ?? [], !0), qr = (r) => Be(r.blocks, !0), nr = (r) => [
   ...Be(r.blocks, !0),
-  ...Le.flatMap((e) => vr(r, e)),
+  ...je.flatMap((e) => hr(r, e)),
   ...Object.values(r.footnotes ?? {}).flat()
-], hr = (r, e) => nr(r).find((n) => n.id === e), Gr = (r, e) => nr(r).findIndex((n) => n.id === e), tr = (r, e) => e === "body" ? r.blocks : r.section[e] ?? [];
+], vr = (r, e) => nr(r).find((n) => n.id === e), Gr = (r, e) => nr(r).findIndex((n) => n.id === e), tr = (r, e) => e === "body" ? r.blocks : r.section[e] ?? [];
 function Ye(r, e, n) {
   for (let t = 0; t < r.length; t++) {
     const s = r[t];
@@ -26,28 +26,28 @@ function Ye(r, e, n) {
         return e === "body" ? { kind: "top", bi: t } : { kind: "band", band: e, bi: t };
     } else if (s.kind === "table")
       for (let o = 0; o < s.rows.length; o++) {
-        const l = s.rows[o];
-        for (let i = 0; i < l.cells.length; i++) {
-          const a = l.cells[i];
-          for (let f = 0; f < a.blocks.length; f++) {
-            const c = a.blocks[f];
+        const i = s.rows[o];
+        for (let a = 0; a < i.cells.length; a++) {
+          const l = i.cells[a];
+          for (let f = 0; f < l.blocks.length; f++) {
+            const c = l.blocks[f];
             if (c.kind === "paragraph" && c.id === n)
-              return { kind: "cell", where: e, bi: t, ri: o, ci: i, pi: f };
+              return { kind: "cell", where: e, bi: t, ri: o, ci: a, pi: f };
           }
         }
       }
   }
   return null;
 }
-function Pe(r, e) {
+function Se(r, e) {
   const n = Ye(r.blocks, "body", e);
   if (n) return n;
-  for (const t of Le) {
+  for (const t of je) {
     const s = Ye(r.section[t] ?? [], t, e);
     if (s) return s;
   }
   for (const [t, s] of Object.entries(r.footnotes ?? {})) {
-    const o = s.findIndex((l) => l.id === e);
+    const o = s.findIndex((i) => i.id === e);
     if (o >= 0) return { kind: "footnote", noteId: t, pi: o };
   }
   return null;
@@ -57,22 +57,22 @@ function Oe(r, e) {
 }
 function ke(r, e, n) {
   if (e.kind === "footnote") {
-    const a = r.footnotes[e.noteId].slice();
-    return a[e.pi] = n, { ...r, footnotes: { ...r.footnotes, [e.noteId]: a } };
+    const l = r.footnotes[e.noteId].slice();
+    return l[e.pi] = n, { ...r, footnotes: { ...r.footnotes, [e.noteId]: l } };
   }
   if (e.kind === "band") {
-    const a = (r.section[e.band] ?? []).slice();
-    return a[e.bi] = n, { ...r, section: { ...r.section, [e.band]: a } };
+    const l = (r.section[e.band] ?? []).slice();
+    return l[e.bi] = n, { ...r, section: { ...r.section, [e.band]: l } };
   }
   if (e.kind === "top") {
-    const a = r.blocks.slice();
-    return a[e.bi] = n, { ...r, blocks: a };
+    const l = r.blocks.slice();
+    return l[e.bi] = n, { ...r, blocks: l };
   }
-  const t = tr(r, e.where).slice(), s = t[e.bi], o = s.rows.slice(), l = { cells: o[e.ri].cells.slice() }, i = { ...l.cells[e.ci], blocks: l.cells[e.ci].blocks.slice() };
-  return i.blocks[e.pi] = n, l.cells[e.ci] = i, o[e.ri] = l, t[e.bi] = { ...s, rows: o, revision: s.revision + 1 }, e.where === "body" ? { ...r, blocks: t } : { ...r, section: { ...r.section, [e.where]: t } };
+  const t = tr(r, e.where).slice(), s = t[e.bi], o = s.rows.slice(), i = { cells: o[e.ri].cells.slice() }, a = { ...i.cells[e.ci], blocks: i.cells[e.ci].blocks.slice() };
+  return a.blocks[e.pi] = n, i.cells[e.ci] = a, o[e.ri] = i, t[e.bi] = { ...s, rows: o, revision: s.revision + 1 }, e.where === "body" ? { ...r, blocks: t } : { ...r, section: { ...r.section, [e.where]: t } };
 }
-const Vr = (r, e) => Pe(r, e)?.kind === "cell", Ne = (r) => r.map((e) => e.text).join(""), Yr = (r, e) => {
-  const n = hr(r, e);
+const Vr = (r, e) => Se(r, e)?.kind === "cell", Ne = (r) => r.map((e) => e.text).join(""), Yr = (r, e) => {
+  const n = vr(r, e);
   return n ? Ne(n.runs) : "";
 };
 function Jr(r, e) {
@@ -117,15 +117,16 @@ function dr(r, e) {
 function kr(r, e) {
   return r.fontFamily === e.fontFamily && r.fontSizePx === e.fontSizePx && r.bold === e.bold && r.italic === e.italic && r.underline === e.underline && r.strikethrough === e.strikethrough && r.color === e.color && !!r.hidden == !!e.hidden && // hidden runs must never merge with visible ones
   (r.letterSpacingPx ?? 0) === (e.letterSpacingPx ?? 0) && r.highlightColor === e.highlightColor && r.verticalAlign === e.verticalAlign && r.link === e.link && r.footnoteRef === e.footnoteRef && // adjacent refs must never merge into one run
-  r.sdtId === e.sdtId;
+  r.sdtId === e.sdtId && // content-control boundaries survive normalization
+  r.fieldId === e.fieldId;
 }
 function ne(r, e) {
   const n = r.filter((s) => s.text.length > 0);
   if (n.length === 0) return [{ text: "", style: r[0]?.style ?? e }];
   const t = [{ ...n[0] }];
   for (let s = 1; s < n.length; s++) {
-    const o = n[s], l = t[t.length - 1];
-    kr(l.style, o.style) ? l.text += o.text : t.push({ ...o });
+    const o = n[s], i = t[t.length - 1];
+    kr(i.style, o.style) ? i.text += o.text : t.push({ ...o });
   }
   return t;
 }
@@ -133,8 +134,8 @@ function J(r, e) {
   const n = [], t = [];
   let s = 0;
   for (const o of r) {
-    const l = s + o.text.length;
-    l <= e ? n.push(o) : s >= e ? t.push(o) : (n.push({ text: o.text.slice(0, e - s), style: o.style }), t.push({ text: o.text.slice(e - s), style: o.style })), s = l;
+    const i = s + o.text.length;
+    i <= e ? n.push(o) : s >= e ? t.push(o) : (n.push({ text: o.text.slice(0, e - s), style: o.style }), t.push({ text: o.text.slice(e - s), style: o.style })), s = i;
   }
   return [n, t];
 }
@@ -142,7 +143,7 @@ function gr(r, e, n) {
   const [, t] = J(r, e), [s] = J(t, n - e);
   return s;
 }
-function ae(r, e) {
+function le(r, e) {
   return dr(r, e) ?? {
     fontFamily: "Georgia, serif",
     fontSizePx: 16,
@@ -153,64 +154,64 @@ function ae(r, e) {
     color: "#202124"
   };
 }
-function br(r, e, n, t) {
-  const s = t ?? ae(r, e), [o, l] = J(r, e);
-  return ne([...o, { text: n, style: s }, ...l], s);
+function wr(r, e, n, t) {
+  const s = t ?? le(r, e), [o, i] = J(r, e);
+  return ne([...o, { text: n, style: s }, ...i], s);
 }
-function wr(r, e, n) {
+function br(r, e, n) {
   const [t, s] = J(r, e);
-  return ne([...t, ...n, ...s], ae(r, e));
+  return ne([...t, ...n, ...s], le(r, e));
 }
 function Ir(r, e, n) {
   const [t, s] = J(r, e), [, o] = J(s, n - e);
-  return ne([...t, ...o], ae(r, e));
+  return ne([...t, ...o], le(r, e));
 }
 function Zr(r, e, n, t) {
-  const [s, o] = J(r, e), [l, i] = J(o, n - e), a = l.map((f) => ({ text: f.text, style: { ...f.style, ...t } }));
-  return ne([...s, ...a, ...i], ae(r, e));
+  const [s, o] = J(r, e), [i, a] = J(o, n - e), l = i.map((f) => ({ text: f.text, style: { ...f.style, ...t } }));
+  return ne([...s, ...l, ...a], le(r, e));
 }
 function _r(r, e, n, t) {
-  const [s, o] = J(r, e), [l, i] = J(o, n - e), a = l.map((v) => v.text).join(""), f = t(a);
+  const [s, o] = J(r, e), [i, a] = J(o, n - e), l = i.map((h) => h.text).join(""), f = t(l);
   let c = 0;
-  const u = f.length === a.length ? l.map((v) => {
-    const h = f.slice(c, c + v.text.length);
-    return c += v.text.length, { text: h, style: v.style };
-  }) : l;
-  return ne([...s, ...u, ...i], ae(r, e));
+  const u = f.length === l.length ? i.map((h) => {
+    const v = f.slice(c, c + h.text.length);
+    return c += h.text.length, { text: v, style: h.style };
+  }) : i;
+  return ne([...s, ...u, ...a], le(r, e));
 }
-const G = (r) => r;
+const H = (r) => r;
 function ge(r, e) {
-  const n = Pe(r, e);
+  const n = Se(r, e);
   if (!n) throw new Error(`paragraph ${e} not found`);
   return { loc: n, block: Oe(r, n) };
 }
-function H(r, e) {
+function $(r, e) {
   return e === "body" ? r.blocks : r.section[e] ?? [];
 }
-function le(r, e, n) {
+function ie(r, e, n) {
   return e === "body" ? { ...r, blocks: n } : { ...r, section: { ...r.section, [e]: n } };
 }
 function qe(r, e) {
-  for (const n of ["body", ...Le]) {
-    const t = H(r, n).findIndex((s) => s.id === e);
+  for (const n of ["body", ...je]) {
+    const t = $(r, n).findIndex((s) => s.id === e);
     if (t >= 0) return { where: n, index: t };
   }
   return null;
 }
 function se(r, e) {
-  const n = qe(r, e), t = n ? H(r, n.where)[n.index] : void 0;
+  const n = qe(r, e), t = n ? $(r, n.where)[n.index] : void 0;
   if (!n || !t || t.kind !== "table") throw new Error(`table ${e} not found`);
   return { where: n.where, bi: n.index, block: t };
 }
 function oe(r, e, n, t) {
-  const s = H(r, e).slice();
-  return s[n] = { ...t, revision: t.revision + 1 }, le(r, e, s);
+  const s = $(r, e).slice();
+  return s[n] = { ...t, revision: t.revision + 1 }, ie(r, e, s);
 }
 function pe(r, e, n, t, s, o) {
-  const l = H(r, e).slice(), i = l[n], a = i.rows.slice(), f = { cells: a[t].cells.slice() };
-  return f.cells[s] = { ...f.cells[s], blocks: o }, a[t] = f, l[n] = { ...i, rows: a, revision: i.revision + 1 }, le(r, e, l);
+  const i = $(r, e).slice(), a = i[n], l = a.rows.slice(), f = { cells: l[t].cells.slice() };
+  return f.cells[s] = { ...f.cells[s], blocks: o }, l[t] = f, i[n] = { ...a, rows: l, revision: a.revision + 1 }, ie(r, e, i);
 }
-function Se(r) {
+function Pe(r) {
   for (const e of r)
     for (const n of e.cells)
       for (const t of n.blocks) if (t.kind === "paragraph") return t;
@@ -218,19 +219,19 @@ function Se(r) {
 function mr(r, e) {
   const n = qe(r, e);
   if (n) {
-    const t = H(r, n.where)[n.index];
+    const t = $(r, n.where)[n.index];
     return t?.kind === "image" ? { kind: "top", where: n.where, index: n.index, image: t } : null;
   }
   for (let t = 0; t < r.blocks.length; t++) {
     const s = r.blocks[t];
     if (s.kind === "table")
       for (let o = 0; o < s.rows.length; o++) {
-        const l = s.rows[o];
-        for (let i = 0; i < l.cells.length; i++) {
-          const a = l.cells[i];
-          for (let f = 0; f < a.blocks.length; f++) {
-            const c = a.blocks[f];
-            if (c.kind === "image" && c.id === e) return { kind: "cell", bi: t, ri: o, ci: i, ii: f, image: c };
+        const i = s.rows[o];
+        for (let a = 0; a < i.cells.length; a++) {
+          const l = i.cells[a];
+          for (let f = 0; f < l.blocks.length; f++) {
+            const c = l.blocks[f];
+            if (c.kind === "image" && c.id === e) return { kind: "cell", bi: t, ri: o, ci: a, ii: f, image: c };
           }
         }
       }
@@ -244,9 +245,9 @@ function yr(r) {
     let s = 0;
     for (const o of t.cells) {
       for (; (n[s] ?? 0) > 0; ) s++;
-      const l = Math.max(1, o.colSpan ?? 1), i = Math.max(1, o.rowSpan ?? 1);
-      if (i > 1) for (let a = 0; a < l; a++) n[s + a] = i;
-      s += l;
+      const i = Math.max(1, o.colSpan ?? 1), a = Math.max(1, o.rowSpan ?? 1);
+      if (a > 1) for (let l = 0; l < i; l++) n[s + l] = a;
+      s += i;
     }
     e = Math.max(e, s);
     for (let o = 0; o < n.length; o++) n[o] > 0 && n[o]--;
@@ -263,29 +264,29 @@ function ue(r, e) {
 function en(r, e) {
   switch (e.type) {
     case "insertText": {
-      const { loc: n, block: t } = ge(r, e.at.blockId), s = br(t.runs, e.at.offset, e.text, e.style), o = e.text.length;
+      const { loc: n, block: t } = ge(r, e.at.blockId), s = wr(t.runs, e.at.offset, e.text, e.style), o = e.text.length;
       return {
         doc: ke(r, n, ue(t, s)),
         inverse: { type: "deleteRange", blockId: t.id, start: e.at.offset, end: e.at.offset + o },
-        mapPosition: (l) => l.blockId === t.id && l.offset >= e.at.offset ? { blockId: l.blockId, offset: l.offset + o } : l,
+        mapPosition: (i) => i.blockId === t.id && i.offset >= e.at.offset ? { blockId: i.blockId, offset: i.offset + o } : i,
         dirtyBlockIds: [t.id]
       };
     }
     case "insertRuns": {
-      const { loc: n, block: t } = ge(r, e.at.blockId), s = Ne(e.runs).length, o = wr(t.runs, e.at.offset, e.runs);
+      const { loc: n, block: t } = ge(r, e.at.blockId), s = Ne(e.runs).length, o = br(t.runs, e.at.offset, e.runs);
       return {
         doc: ke(r, n, ue(t, o)),
         inverse: { type: "deleteRange", blockId: t.id, start: e.at.offset, end: e.at.offset + s },
-        mapPosition: (l) => l.blockId === t.id && l.offset >= e.at.offset ? { blockId: l.blockId, offset: l.offset + s } : l,
+        mapPosition: (i) => i.blockId === t.id && i.offset >= e.at.offset ? { blockId: i.blockId, offset: i.offset + s } : i,
         dirtyBlockIds: [t.id]
       };
     }
     case "deleteRange": {
-      const { loc: n, block: t } = ge(r, e.blockId), s = gr(t.runs, e.start, e.end), o = Ir(t.runs, e.start, e.end), l = e.end - e.start;
+      const { loc: n, block: t } = ge(r, e.blockId), s = gr(t.runs, e.start, e.end), o = Ir(t.runs, e.start, e.end), i = e.end - e.start;
       return {
         doc: ke(r, n, ue(t, o)),
         inverse: { type: "insertRuns", at: { blockId: t.id, offset: e.start }, runs: s },
-        mapPosition: (i) => i.blockId !== t.id || i.offset <= e.start ? i : { blockId: i.blockId, offset: i.offset >= e.end ? i.offset - l : e.start },
+        mapPosition: (a) => a.blockId !== t.id || a.offset <= e.start ? a : { blockId: a.blockId, offset: a.offset >= e.end ? a.offset - i : e.start },
         dirtyBlockIds: [t.id]
       };
     }
@@ -294,15 +295,15 @@ function en(r, e) {
       return {
         doc: ke(r, n, ue(t, e.runs)),
         inverse: { type: "setRuns", blockId: t.id, runs: t.runs },
-        mapPosition: G,
+        mapPosition: H,
         // callers use setRuns for length-preserving restyles
         dirtyBlockIds: [t.id]
       };
     }
     case "setParaStyle": {
       const { loc: n, block: t } = ge(r, e.blockId), s = {};
-      for (const l of Object.keys(e.patch))
-        s[l] = t.style[l];
+      for (const i of Object.keys(e.patch))
+        s[i] = t.style[i];
       const o = {
         ...t,
         style: { ...t.style, ...e.patch },
@@ -311,30 +312,30 @@ function en(r, e) {
       return {
         doc: ke(r, n, o),
         inverse: { type: "setParaStyle", blockId: t.id, patch: s },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: [t.id]
       };
     }
     case "splitParagraph": {
-      const n = Pe(r, e.at.blockId);
+      const n = Se(r, e.at.blockId);
       if (!n) throw new Error(`paragraph ${e.at.blockId} not found`);
-      const t = Oe(r, n), [s, o] = J(t.runs, e.at.offset), l = ae(t.runs, e.at.offset), i = ue(t, ne(s, l)), a = {
+      const t = Oe(r, n), [s, o] = J(t.runs, e.at.offset), i = le(t.runs, e.at.offset), a = ue(t, ne(s, i)), l = {
         kind: "paragraph",
         id: e.newBlockId,
         revision: 0,
-        runs: ne(o, l),
+        runs: ne(o, i),
         style: e.newStyle ?? { ...t.style }
       };
       let f;
       if (n.kind === "cell") {
-        const u = H(r, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
-        u.splice(n.pi, 1, i, a), f = pe(r, n.where, n.bi, n.ri, n.ci, u);
+        const u = $(r, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
+        u.splice(n.pi, 1, a, l), f = pe(r, n.where, n.bi, n.ri, n.ci, u);
       } else if (n.kind === "footnote") {
         const c = r.footnotes[n.noteId].slice();
-        c.splice(n.pi, 1, i, a), f = { ...r, footnotes: { ...r.footnotes, [n.noteId]: c } };
+        c.splice(n.pi, 1, a, l), f = { ...r, footnotes: { ...r.footnotes, [n.noteId]: c } };
       } else {
-        const c = n.kind === "band" ? n.band : "body", u = H(r, c).slice();
-        u.splice(n.bi, 1, i, a), f = le(r, c, u);
+        const c = n.kind === "band" ? n.band : "body", u = $(r, c).slice();
+        u.splice(n.bi, 1, a, l), f = ie(r, c, u);
       }
       return {
         doc: f,
@@ -344,71 +345,71 @@ function en(r, e) {
       };
     }
     case "mergeParagraphs": {
-      const n = Pe(r, e.firstBlockId);
+      const n = Se(r, e.firstBlockId);
       if (!n) throw new Error(`paragraph ${e.firstBlockId} not found`);
       const t = Oe(r, n);
       let s;
       if (n.kind === "cell") {
-        const f = H(r, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks[n.pi + 1];
+        const f = $(r, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks[n.pi + 1];
         if (!f || f.kind !== "paragraph")
           throw new Error("mergeParagraphs: no next paragraph in cell");
         s = f;
       } else if (n.kind === "footnote") {
-        const a = r.footnotes[n.noteId][n.pi + 1];
-        if (!a) throw new Error("mergeParagraphs: no next paragraph in footnote");
-        s = a;
+        const l = r.footnotes[n.noteId][n.pi + 1];
+        if (!l) throw new Error("mergeParagraphs: no next paragraph in footnote");
+        s = l;
       } else {
-        const a = n.kind === "band" ? n.band : "body", f = H(r, a)[n.bi + 1];
+        const l = n.kind === "band" ? n.band : "body", f = $(r, l)[n.bi + 1];
         if (!f || f.kind !== "paragraph")
           throw new Error("mergeParagraphs: no next paragraph");
         s = f;
       }
-      const o = Ne(t.runs).length, l = ue(
+      const o = Ne(t.runs).length, i = ue(
         t,
-        ne([...t.runs, ...s.runs], ae(t.runs, o))
+        ne([...t.runs, ...s.runs], le(t.runs, o))
       );
-      let i;
+      let a;
       if (n.kind === "cell") {
-        const f = H(r, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
-        f.splice(n.pi, 2, l), i = pe(r, n.where, n.bi, n.ri, n.ci, f);
+        const f = $(r, n.where)[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
+        f.splice(n.pi, 2, i), a = pe(r, n.where, n.bi, n.ri, n.ci, f);
       } else if (n.kind === "footnote") {
-        const a = r.footnotes[n.noteId].slice();
-        a.splice(n.pi, 2, l), i = { ...r, footnotes: { ...r.footnotes, [n.noteId]: a } };
+        const l = r.footnotes[n.noteId].slice();
+        l.splice(n.pi, 2, i), a = { ...r, footnotes: { ...r.footnotes, [n.noteId]: l } };
       } else {
-        const a = n.kind === "band" ? n.band : "body", f = H(r, a).slice();
-        f.splice(n.bi, 2, l), i = le(r, a, f);
+        const l = n.kind === "band" ? n.band : "body", f = $(r, l).slice();
+        f.splice(n.bi, 2, i), a = ie(r, l, f);
       }
       return {
-        doc: i,
+        doc: a,
         inverse: {
           type: "splitParagraph",
           at: { blockId: t.id, offset: o },
           newBlockId: s.id,
           newStyle: s.style
         },
-        mapPosition: (a) => a.blockId === s.id ? { blockId: t.id, offset: o + a.offset } : a,
+        mapPosition: (l) => l.blockId === s.id ? { blockId: t.id, offset: o + l.offset } : l,
         dirtyBlockIds: [t.id, s.id]
       };
     }
     case "insertBlock": {
-      const n = e.where ?? "body", t = H(r, n).slice();
+      const n = e.where ?? "body", t = $(r, n).slice();
       return t.splice(e.index, 0, e.block), {
-        doc: le(r, n, t),
+        doc: ie(r, n, t),
         inverse: { type: "removeBlock", blockId: e.block.id },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: [e.block.id]
       };
     }
     case "removeBlock": {
       const n = qe(r, e.blockId);
       if (!n) throw new Error(`block ${e.blockId} not found`);
-      const t = H(r, n.where).slice(), s = t[n.index];
+      const t = $(r, n.where).slice(), s = t[n.index];
       t.splice(n.index, 1);
       const o = t[Math.min(n.index, t.length - 1)];
       return {
-        doc: le(r, n.where, t),
+        doc: ie(r, n.where, t),
         inverse: { type: "insertBlock", index: n.index, block: s, where: n.where },
-        mapPosition: (l) => l.blockId === e.blockId && o ? { blockId: o.id, offset: 0 } : l,
+        mapPosition: (i) => i.blockId === e.blockId && o ? { blockId: o.id, offset: 0 } : i,
         dirtyBlockIds: [e.blockId]
       };
     }
@@ -416,21 +417,21 @@ function en(r, e) {
       const n = mr(r, e.blockId);
       if (!n) throw new Error(`image ${e.blockId} not found`);
       const t = n.image, s = {};
-      for (const i of Object.keys(e.patch))
-        s[i] = t[i];
-      const o = { ...t, ...e.patch, revision: t.revision + 1 };
-      let l;
+      e.patch.widthPx !== void 0 && (s.widthPx = t.widthPx), e.patch.heightPx !== void 0 && (s.heightPx = t.heightPx), e.patch.align !== void 0 && (s.align = t.align), e.patch.wrap !== void 0 && (s.wrap = t.wrap ?? null), e.patch.anchor !== void 0 && (s.anchor = t.anchor ?? null);
+      const o = { ...t, revision: t.revision + 1 };
+      e.patch.widthPx !== void 0 && (o.widthPx = e.patch.widthPx), e.patch.heightPx !== void 0 && (o.heightPx = e.patch.heightPx), e.patch.align !== void 0 && (o.align = e.patch.align), e.patch.wrap !== void 0 && (e.patch.wrap === null ? delete o.wrap : o.wrap = e.patch.wrap), e.patch.anchor !== void 0 && (e.patch.anchor === null ? delete o.anchor : o.anchor = e.patch.anchor);
+      let i;
       if (n.kind === "top") {
-        const i = H(r, n.where).slice();
-        i[n.index] = o, l = le(r, n.where, i);
+        const a = $(r, n.where).slice();
+        a[n.index] = o, i = ie(r, n.where, a);
       } else {
-        const a = r.blocks[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
-        a[n.ii] = o, l = pe(r, "body", n.bi, n.ri, n.ci, a);
+        const l = r.blocks[n.bi].rows[n.ri].cells[n.ci].blocks.slice();
+        l[n.ii] = o, i = pe(r, "body", n.bi, n.ri, n.ci, l);
       }
       return {
-        doc: l,
+        doc: i,
         inverse: { type: "setImageProps", blockId: e.blockId, patch: s },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: [e.blockId]
       };
     }
@@ -439,20 +440,20 @@ function en(r, e) {
       return {
         doc: oe(r, n, t, { ...s, colFractions: e.fractions }),
         inverse: { type: "setTableColFractions", blockId: e.blockId, fractions: o },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: [e.blockId]
       };
     }
     case "setTableRow": {
       const { where: n, bi: t, block: s } = se(r, e.tableId), o = s.rows[e.rowIndex];
       if (!o) throw new Error("setTableRow: no such row");
-      const l = new Set(o.cells.flatMap((f) => f.blocks.map((c) => c.id))), i = s.rows.slice();
-      i[e.rowIndex] = e.row;
-      const a = Se([e.row]);
+      const i = new Set(o.cells.flatMap((f) => f.blocks.map((c) => c.id))), a = s.rows.slice();
+      a[e.rowIndex] = e.row;
+      const l = Pe([e.row]);
       return {
-        doc: oe(r, n, t, { ...s, rows: i }),
+        doc: oe(r, n, t, { ...s, rows: a }),
         inverse: { type: "setTableRow", tableId: e.tableId, rowIndex: e.rowIndex, row: o },
-        mapPosition: (f) => l.has(f.blockId) ? e.row.cells.some((u) => u.blocks.some((v) => v.id === f.blockId)) || !a ? f : { blockId: a.id, offset: 0 } : f,
+        mapPosition: (f) => i.has(f.blockId) ? e.row.cells.some((u) => u.blocks.some((h) => h.id === f.blockId)) || !l ? f : { blockId: l.id, offset: 0 } : f,
         dirtyBlockIds: [e.tableId]
       };
     }
@@ -461,20 +462,20 @@ function en(r, e) {
       return o.splice(e.rowIndex, 0, e.row), {
         doc: oe(r, n, t, { ...s, rows: o }),
         inverse: { type: "removeTableRow", tableId: e.tableId, rowIndex: e.rowIndex },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: [e.tableId]
       };
     }
     case "removeTableRow": {
       const { where: n, bi: t, block: s } = se(r, e.tableId), o = s.rows[e.rowIndex];
       if (!o) throw new Error("removeTableRow: no such row");
-      const l = s.rows.slice();
-      l.splice(e.rowIndex, 1);
-      const i = new Set(o.cells.flatMap((c) => c.blocks.map((u) => u.id))), a = l[Math.min(e.rowIndex, l.length - 1)], f = a ? Se([a]) : void 0;
+      const i = s.rows.slice();
+      i.splice(e.rowIndex, 1);
+      const a = new Set(o.cells.flatMap((c) => c.blocks.map((u) => u.id))), l = i[Math.min(e.rowIndex, i.length - 1)], f = l ? Pe([l]) : void 0;
       return {
-        doc: oe(r, n, t, { ...s, rows: l }),
+        doc: oe(r, n, t, { ...s, rows: i }),
         inverse: { type: "insertTableRow", tableId: e.tableId, rowIndex: e.rowIndex, row: o },
-        mapPosition: (c) => i.has(c.blockId) && f ? { blockId: f.id, offset: 0 } : c,
+        mapPosition: (c) => a.has(c.blockId) && f ? { blockId: f.id, offset: 0 } : c,
         dirtyBlockIds: [e.tableId]
       };
     }
@@ -483,7 +484,7 @@ function en(r, e) {
       return e.def ? t[e.listId] = e.def : delete t[e.listId], {
         doc: { ...r, lists: t },
         inverse: { type: "setListDefinition", listId: e.listId, def: n },
-        mapPosition: G,
+        mapPosition: H,
         // Indents come from the definition → every paragraph in the list must
         // re-measure; their (revision,width) line-cache keys change with width.
         dirtyBlockIds: []
@@ -492,50 +493,50 @@ function en(r, e) {
     case "setTableStructure": {
       const { where: n, bi: t, block: s } = se(r, e.tableId), o = new Set(
         s.rows.flatMap((f) => f.cells.flatMap((c) => c.blocks.map((u) => u.id)))
-      ), l = Se(e.rows), i = { ...s, rows: e.rows };
-      e.colFractions ? i.colFractions = e.colFractions : delete i.colFractions;
-      const a = { type: "setTableStructure", tableId: e.tableId, rows: s.rows };
-      return s.colFractions && (a.colFractions = s.colFractions), {
-        doc: oe(r, n, t, i),
-        inverse: a,
+      ), i = Pe(e.rows), a = { ...s, rows: e.rows };
+      e.colFractions ? a.colFractions = e.colFractions : delete a.colFractions;
+      const l = { type: "setTableStructure", tableId: e.tableId, rows: s.rows };
+      return s.colFractions && (l.colFractions = s.colFractions), {
+        doc: oe(r, n, t, a),
+        inverse: l,
         mapPosition: (f) => o.has(f.blockId) ? e.rows.some(
-          (u) => u.cells.some((v) => v.blocks.some((h) => h.id === f.blockId))
-        ) || !l ? f : { blockId: l.id, offset: 0 } : f,
+          (u) => u.cells.some((h) => h.blocks.some((v) => v.id === f.blockId))
+        ) || !i ? f : { blockId: i.id, offset: 0 } : f,
         dirtyBlockIds: [e.tableId]
       };
     }
     case "insertTableColumn": {
       const { where: n, bi: t, block: s } = se(r, e.tableId), o = { type: "setTableStructure", tableId: e.tableId, rows: s.rows };
       s.colFractions && (o.colFractions = s.colFractions);
-      const l = s.rows.map((a, f) => {
+      const i = s.rows.map((l, f) => {
         const c = [];
-        let u = 0, v = !1;
-        for (const h of a.cells) {
-          const d = h.colSpan ?? 1;
-          if (!v && e.colIndex > u && e.colIndex < u + d)
-            c.push({ ...h, colSpan: d + 1 }), v = !0;
-          else if (!v && e.colIndex === u) {
+        let u = 0, h = !1;
+        for (const v of l.cells) {
+          const d = v.colSpan ?? 1;
+          if (!h && e.colIndex > u && e.colIndex < u + d)
+            c.push({ ...v, colSpan: d + 1 }), h = !0;
+          else if (!h && e.colIndex === u) {
             const g = e.cells[f];
-            g && c.push(g), c.push(h), v = !0;
+            g && c.push(g), c.push(v), h = !0;
           } else
-            c.push(h);
+            c.push(v);
           u += d;
         }
-        if (!v) {
-          const h = e.cells[f];
-          h && c.push(h);
+        if (!h) {
+          const v = e.cells[f];
+          v && c.push(v);
         }
         return { cells: c };
       });
-      let i = e.fractions;
-      if (!i) {
-        const a = Ce(s), f = 1 / (a.length + 1);
-        i = a.map((c) => c * (1 - f)), i.splice(e.colIndex, 0, f);
+      let a = e.fractions;
+      if (!a) {
+        const l = Ce(s), f = 1 / (l.length + 1);
+        a = l.map((c) => c * (1 - f)), a.splice(e.colIndex, 0, f);
       }
       return {
-        doc: oe(r, n, t, { ...s, rows: l, colFractions: i }),
+        doc: oe(r, n, t, { ...s, rows: i, colFractions: a }),
         inverse: o,
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: [e.tableId]
       };
     }
@@ -544,7 +545,7 @@ function en(r, e) {
       return {
         doc: { ...r, stylesheet: e.stylesheet },
         inverse: { type: "setStylesheet", stylesheet: n },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: []
         // restyling paragraphs happens via setRuns/setParaStyle ops
       };
@@ -565,7 +566,7 @@ function en(r, e) {
       return e.geometry.columns ? s.columns = e.geometry.columns : delete s.columns, e.geometry.pageNumberStart !== null ? s.pageNumberStart = e.geometry.pageNumberStart : delete s.pageNumberStart, {
         doc: { ...r, section: s },
         inverse: { type: "setSectionProps", geometry: t },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: []
         // geometry change → full re-walk; line caches keyed by width
       };
@@ -573,11 +574,11 @@ function en(r, e) {
     case "setFootnote": {
       const n = r.footnotes?.[e.noteId] ?? null, t = { ...r.footnotes ?? {} };
       e.paras ? t[e.noteId] = e.paras : delete t[e.noteId];
-      const s = new Set((n ?? []).map((l) => l.id)), o = r.blocks.find((l) => l.kind === "paragraph");
+      const s = new Set((n ?? []).map((i) => i.id)), o = r.blocks.find((i) => i.kind === "paragraph");
       return {
         doc: { ...r, footnotes: t },
         inverse: { type: "setFootnote", noteId: e.noteId, paras: n },
-        mapPosition: (l) => s.has(l.blockId) ? (e.paras ?? []).some((a) => a.id === l.blockId) || !o ? l : { blockId: o.id, offset: 0 } : l,
+        mapPosition: (i) => s.has(i.blockId) ? (e.paras ?? []).some((l) => l.id === i.blockId) || !o ? i : { blockId: o.id, offset: 0 } : i,
         dirtyBlockIds: []
       };
     }
@@ -586,17 +587,37 @@ function en(r, e) {
       return e.props ? t[e.id] = e.props : delete t[e.id], {
         doc: { ...r, sdts: t },
         inverse: { type: "setSdtProps", id: e.id, props: n },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: []
         // run markers change via setRuns/applyStylePatch ops
       };
     }
+    case "setField": {
+      const n = r.fields?.[e.id] ?? null, t = { ...r.fields ?? {} };
+      return e.def ? t[e.id] = e.def : delete t[e.id], {
+        doc: { ...r, fields: t },
+        inverse: { type: "setField", id: e.id, def: n },
+        mapPosition: H,
+        dirtyBlockIds: []
+        // run/block fieldId markers change via setRuns/insert ops
+      };
+    }
+    case "setTocInstruction": {
+      const n = r.tocInstruction ?? null, t = { ...r };
+      return e.instruction !== null ? t.tocInstruction = e.instruction : delete t.tocInstruction, {
+        doc: t,
+        inverse: { type: "setTocInstruction", instruction: n },
+        mapPosition: H,
+        dirtyBlockIds: []
+        // entries are regenerated via insert/removeBlock ops in the same tx
+      };
+    }
     case "setBookmark": {
       const n = r.bookmarks?.[e.name] ?? null, t = { ...r.bookmarks ?? {} };
       return e.range ? t[e.name] = e.range : delete t[e.name], {
         doc: { ...r, bookmarks: t },
         inverse: { type: "setBookmark", name: e.name, range: n },
-        mapPosition: G,
+        mapPosition: H,
         dirtyBlockIds: []
       };
     }
@@ -604,45 +625,45 @@ function en(r, e) {
       const n = r.section[e.band] ?? null, t = { ...r.section };
       e.blocks ? t[e.band] = e.blocks : delete t[e.band];
       const s = new Set(
-        (n ?? []).filter((l) => l.kind === "paragraph").map((l) => l.id)
-      ), o = r.blocks.find((l) => l.kind === "paragraph");
+        (n ?? []).filter((i) => i.kind === "paragraph").map((i) => i.id)
+      ), o = r.blocks.find((i) => i.kind === "paragraph");
       return {
         doc: { ...r, section: t },
         inverse: { type: "setSectionBand", band: e.band, blocks: n },
-        mapPosition: (l) => s.has(l.blockId) ? (e.blocks ?? []).some((a) => a.id === l.blockId) || !o ? l : { blockId: o.id, offset: 0 } : l,
+        mapPosition: (i) => s.has(i.blockId) ? (e.blocks ?? []).some((l) => l.id === i.blockId) || !o ? i : { blockId: o.id, offset: 0 } : i,
         dirtyBlockIds: []
       };
     }
     case "removeTableColumn": {
       const { where: n, bi: t, block: s } = se(r, e.tableId), o = { type: "setTableStructure", tableId: e.tableId, rows: s.rows };
       s.colFractions && (o.colFractions = s.colFractions);
-      const l = Ce(s), i = /* @__PURE__ */ new Set(), a = s.rows.map((h) => {
+      const i = Ce(s), a = /* @__PURE__ */ new Set(), l = s.rows.map((v) => {
         const d = [];
         let g = 0;
-        for (const w of h.cells) {
-          const I = w.colSpan ?? 1;
+        for (const b of v.cells) {
+          const I = b.colSpan ?? 1;
           if (e.colIndex >= g && e.colIndex < g + I)
             if (I > 1) {
-              const y = { ...w };
+              const y = { ...b };
               I - 1 > 1 ? y.colSpan = I - 1 : delete y.colSpan, d.push(y);
             } else
-              for (const y of w.blocks) i.add(y.id);
+              for (const y of b.blocks) a.add(y.id);
           else
-            d.push(w);
+            d.push(b);
           g += I;
         }
         return { cells: d };
-      }), f = l.filter((h, d) => d !== e.colIndex), c = f.reduce((h, d) => h + d, 0) || 1, u = f.map((h) => h / c), v = Se(a);
+      }), f = i.filter((v, d) => d !== e.colIndex), c = f.reduce((v, d) => v + d, 0) || 1, u = f.map((v) => v / c), h = Pe(l);
       return {
-        doc: oe(r, n, t, { ...s, rows: a, colFractions: u }),
+        doc: oe(r, n, t, { ...s, rows: l, colFractions: u }),
         inverse: o,
-        mapPosition: (h) => i.has(h.blockId) && v ? { blockId: v.id, offset: 0 } : h,
+        mapPosition: (v) => a.has(v.blockId) && h ? { blockId: h.id, offset: 0 } : v,
         dirtyBlockIds: [e.tableId]
       };
     }
   }
 }
-var R = Uint8Array, L = Uint16Array, Ge = Int32Array, Fe = new R([
+var R = Uint8Array, q = Uint16Array, Ge = Int32Array, Fe = new R([
   0,
   0,
   0,
@@ -712,37 +733,37 @@ var R = Uint8Array, L = Uint16Array, Ge = Int32Array, Fe = new R([
   0,
   0
 ]), We = new R([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]), sr = function(r, e) {
-  for (var n = new L(31), t = 0; t < 31; ++t)
+  for (var n = new q(31), t = 0; t < 31; ++t)
     n[t] = e += 1 << r[t - 1];
   for (var s = new Ge(n[30]), t = 1; t < 30; ++t)
     for (var o = n[t]; o < n[t + 1]; ++o)
       s[o] = o - n[t] << 5 | t;
   return { b: n, r: s };
-}, or = sr(Fe, 2), lr = or.b, De = or.r;
-lr[28] = 258, De[258] = 28;
-var ar = sr(Re, 0), xr = ar.b, Je = ar.r, He = new L(32768);
+}, or = sr(Fe, 2), ir = or.b, De = or.r;
+ir[28] = 258, De[258] = 28;
+var lr = sr(Re, 0), xr = lr.b, Je = lr.r, He = new q(32768);
 for (var m = 0; m < 32768; ++m) {
   var re = (m & 43690) >> 1 | (m & 21845) << 1;
   re = (re & 52428) >> 2 | (re & 13107) << 2, re = (re & 61680) >> 4 | (re & 3855) << 4, He[m] = ((re & 65280) >> 8 | (re & 255) << 8) >> 1;
 }
 var X = (function(r, e, n) {
-  for (var t = r.length, s = 0, o = new L(e); s < t; ++s)
+  for (var t = r.length, s = 0, o = new q(e); s < t; ++s)
     r[s] && ++o[r[s] - 1];
-  var l = new L(e);
+  var i = new q(e);
   for (s = 1; s < e; ++s)
-    l[s] = l[s - 1] + o[s - 1] << 1;
-  var i;
+    i[s] = i[s - 1] + o[s - 1] << 1;
+  var a;
   if (n) {
-    i = new L(1 << e);
-    var a = 15 - e;
+    a = new q(1 << e);
+    var l = 15 - e;
     for (s = 0; s < t; ++s)
       if (r[s])
-        for (var f = s << 4 | r[s], c = e - r[s], u = l[r[s] - 1]++ << c, v = u | (1 << c) - 1; u <= v; ++u)
-          i[He[u] >> a] = f;
+        for (var f = s << 4 | r[s], c = e - r[s], u = i[r[s] - 1]++ << c, h = u | (1 << c) - 1; u <= h; ++u)
+          a[He[u] >> l] = f;
   } else
-    for (i = new L(t), s = 0; s < t; ++s)
-      r[s] && (i[s] = He[l[r[s] - 1]++] >> 15 - r[s]);
-  return i;
+    for (a = new q(t), s = 0; s < t; ++s)
+      r[s] && (a[s] = He[i[r[s] - 1]++] >> 15 - r[s]);
+  return a;
 }), te = new R(288);
 for (var m = 0; m < 144; ++m)
   te[m] = 8;
@@ -755,7 +776,7 @@ for (var m = 280; m < 288; ++m)
 var Ie = new R(32);
 for (var m = 0; m < 32; ++m)
   Ie[m] = 5;
-var Sr = /* @__PURE__ */ X(te, 9, 0), Pr = /* @__PURE__ */ X(te, 9, 1), Br = /* @__PURE__ */ X(Ie, 5, 0), Fr = /* @__PURE__ */ X(Ie, 5, 1), Me = function(r) {
+var Pr = /* @__PURE__ */ X(te, 9, 0), Sr = /* @__PURE__ */ X(te, 9, 1), Br = /* @__PURE__ */ X(Ie, 5, 0), Fr = /* @__PURE__ */ X(Ie, 5, 1), Me = function(r) {
   for (var e = r[0], n = 1; n < r.length; ++n)
     r[n] > e && (e = r[n]);
   return e;
@@ -795,106 +816,106 @@ var Sr = /* @__PURE__ */ X(te, 9, 0), Pr = /* @__PURE__ */ X(te, 9, 1), Br = /*
   var s = r.length, o = t ? t.length : 0;
   if (!s || e.f && !e.l)
     return n || new R(0);
-  var l = !n, i = l || e.i != 2, a = e.i;
-  l && (n = new R(s * 3));
-  var f = function(he) {
+  var i = !n, a = i || e.i != 2, l = e.i;
+  i && (n = new R(s * 3));
+  var f = function(ve) {
     var de = n.length;
-    if (he > de) {
-      var fe = new R(Math.max(de * 2, he));
+    if (ve > de) {
+      var fe = new R(Math.max(de * 2, ve));
       fe.set(n), n = fe;
     }
-  }, c = e.f || 0, u = e.p || 0, v = e.b || 0, h = e.l, d = e.d, g = e.m, w = e.n, I = s * 8;
+  }, c = e.f || 0, u = e.p || 0, h = e.b || 0, v = e.l, d = e.d, g = e.m, b = e.n, I = s * 8;
   do {
-    if (!h) {
+    if (!v) {
       c = Y(r, u, 1);
       var y = Y(r, u + 1, 3);
       if (u += 3, y)
         if (y == 1)
-          h = Pr, d = Fr, g = 9, w = 5;
+          v = Sr, d = Fr, g = 9, b = 5;
         else if (y == 2) {
-          var C = Y(r, u, 31) + 257, F = Y(r, u + 10, 15) + 4, b = C + Y(r, u + 5, 31) + 1;
+          var C = Y(r, u, 31) + 257, F = Y(r, u + 10, 15) + 4, w = C + Y(r, u + 5, 31) + 1;
           u += 14;
-          for (var k = new R(b), M = new R(19), T = 0; T < F; ++T)
+          for (var k = new R(w), M = new R(19), T = 0; T < F; ++T)
             M[We[T]] = Y(r, u + T * 3, 7);
           u += F * 3;
-          for (var O = Me(M), ee = (1 << O) - 1, $ = X(M, O, 1), T = 0; T < b; ) {
-            var W = $[Y(r, u, ee)];
+          for (var O = Me(M), ee = (1 << O) - 1, U = X(M, O, 1), T = 0; T < w; ) {
+            var W = U[Y(r, u, ee)];
             u += W & 15;
-            var P = W >> 4;
-            if (P < 16)
-              k[T++] = P;
+            var S = W >> 4;
+            if (S < 16)
+              k[T++] = S;
             else {
               var E = 0, x = 0;
-              for (P == 16 ? (x = 3 + Y(r, u, 3), u += 2, E = k[T - 1]) : P == 17 ? (x = 3 + Y(r, u, 7), u += 3) : P == 18 && (x = 11 + Y(r, u, 127), u += 7); x--; )
+              for (S == 16 ? (x = 3 + Y(r, u, 3), u += 2, E = k[T - 1]) : S == 17 ? (x = 3 + Y(r, u, 7), u += 3) : S == 18 && (x = 11 + Y(r, u, 127), u += 7); x--; )
                 k[T++] = E;
             }
           }
           var D = k.subarray(0, C), A = k.subarray(C);
-          g = Me(D), w = Me(A), h = X(D, g, 1), d = X(A, w, 1);
+          g = Me(D), b = Me(A), v = X(D, g, 1), d = X(A, b, 1);
         } else
           N(1);
       else {
-        var P = Ve(u) + 4, B = r[P - 4] | r[P - 3] << 8, p = P + B;
+        var S = Ve(u) + 4, B = r[S - 4] | r[S - 3] << 8, p = S + B;
         if (p > s) {
-          a && N(0);
+          l && N(0);
           break;
         }
-        i && f(v + B), n.set(r.subarray(P, p), v), e.b = v += B, e.p = u = p * 8, e.f = c;
+        a && f(h + B), n.set(r.subarray(S, p), h), e.b = h += B, e.p = u = p * 8, e.f = c;
         continue;
       }
       if (u > I) {
-        a && N(0);
+        l && N(0);
         break;
       }
     }
-    i && f(v + 131072);
-    for (var ve = (1 << g) - 1, q = (1 << w) - 1, Z = u; ; Z = u) {
-      var E = h[Ee(r, u) & ve], U = E >> 4;
+    a && f(h + 131072);
+    for (var he = (1 << g) - 1, G = (1 << b) - 1, Z = u; ; Z = u) {
+      var E = v[Ee(r, u) & he], L = E >> 4;
       if (u += E & 15, u > I) {
-        a && N(0);
+        l && N(0);
         break;
       }
-      if (E || N(2), U < 256)
-        n[v++] = U;
-      else if (U == 256) {
-        Z = u, h = null;
+      if (E || N(2), L < 256)
+        n[h++] = L;
+      else if (L == 256) {
+        Z = u, v = null;
         break;
       } else {
-        var j = U - 254;
-        if (U > 264) {
-          var T = U - 257, S = Fe[T];
-          j = Y(r, u, (1 << S) - 1) + lr[T], u += S;
+        var j = L - 254;
+        if (L > 264) {
+          var T = L - 257, P = Fe[T];
+          j = Y(r, u, (1 << P) - 1) + ir[T], u += P;
         }
-        var K = d[Ee(r, u) & q], ie = K >> 4;
+        var K = d[Ee(r, u) & G], ae = K >> 4;
         K || N(3), u += K & 15;
-        var A = xr[ie];
-        if (ie > 3) {
-          var S = Re[ie];
-          A += Ee(r, u) & (1 << S) - 1, u += S;
+        var A = xr[ae];
+        if (ae > 3) {
+          var P = Re[ae];
+          A += Ee(r, u) & (1 << P) - 1, u += P;
         }
         if (u > I) {
-          a && N(0);
+          l && N(0);
           break;
         }
-        i && f(v + 131072);
-        var ce = v + j;
-        if (v < A) {
+        a && f(h + 131072);
+        var ce = h + j;
+        if (h < A) {
           var ye = o - A, xe = Math.min(A, ce);
-          for (ye + v < 0 && N(3); v < xe; ++v)
-            n[v] = t[ye + v];
+          for (ye + h < 0 && N(3); h < xe; ++h)
+            n[h] = t[ye + h];
         }
-        for (; v < ce; ++v)
-          n[v] = n[v - A];
+        for (; h < ce; ++h)
+          n[h] = n[h - A];
       }
     }
-    e.l = h, e.p = Z, e.b = v, e.f = c, h && (c = 1, e.m = g, e.d = d, e.n = w);
+    e.l = v, e.p = Z, e.b = h, e.f = c, v && (c = 1, e.m = g, e.d = d, e.n = b);
   } while (!c);
-  return v != n.length && l ? me(n, 0, v) : n.subarray(0, v);
+  return h != n.length && i ? me(n, 0, h) : n.subarray(0, h);
 }, _ = function(r, e, n) {
   n <<= e & 7;
   var t = e / 8 | 0;
   r[t] |= n, r[t + 1] |= n >> 8;
-}, be = function(r, e, n) {
+}, we = function(r, e, n) {
   n <<= e & 7;
   var t = e / 8 | 0;
   r[t] |= n, r[t + 1] |= n >> 8, r[t + 2] |= n >> 16;
@@ -905,165 +926,165 @@ var Sr = /* @__PURE__ */ X(te, 9, 0), Pr = /* @__PURE__ */ X(te, 9, 1), Br = /*
   if (!s)
     return { t: cr, l: 0 };
   if (s == 1) {
-    var l = new R(n[0].s + 1);
-    return l[n[0].s] = 1, { t: l, l: 1 };
+    var i = new R(n[0].s + 1);
+    return i[n[0].s] = 1, { t: i, l: 1 };
   }
   n.sort(function(p, C) {
     return p.f - C.f;
   }), n.push({ s: -1, f: 25001 });
-  var i = n[0], a = n[1], f = 0, c = 1, u = 2;
-  for (n[0] = { s: -1, f: i.f + a.f, l: i, r: a }; c != s - 1; )
-    i = n[n[f].f < n[u].f ? f++ : u++], a = n[f != c && n[f].f < n[u].f ? f++ : u++], n[c++] = { s: -1, f: i.f + a.f, l: i, r: a };
-  for (var v = o[0].s, t = 1; t < s; ++t)
-    o[t].s > v && (v = o[t].s);
-  var h = new L(v + 1), d = $e(n[c - 1], h, 0);
+  var a = n[0], l = n[1], f = 0, c = 1, u = 2;
+  for (n[0] = { s: -1, f: a.f + l.f, l: a, r: l }; c != s - 1; )
+    a = n[n[f].f < n[u].f ? f++ : u++], l = n[f != c && n[f].f < n[u].f ? f++ : u++], n[c++] = { s: -1, f: a.f + l.f, l: a, r: l };
+  for (var h = o[0].s, t = 1; t < s; ++t)
+    o[t].s > h && (h = o[t].s);
+  var v = new q(h + 1), d = $e(n[c - 1], v, 0);
   if (d > e) {
-    var t = 0, g = 0, w = d - e, I = 1 << w;
+    var t = 0, g = 0, b = d - e, I = 1 << b;
     for (o.sort(function(C, F) {
-      return h[F.s] - h[C.s] || C.f - F.f;
+      return v[F.s] - v[C.s] || C.f - F.f;
     }); t < s; ++t) {
       var y = o[t].s;
-      if (h[y] > e)
-        g += I - (1 << d - h[y]), h[y] = e;
+      if (v[y] > e)
+        g += I - (1 << d - v[y]), v[y] = e;
       else
         break;
     }
-    for (g >>= w; g > 0; ) {
-      var P = o[t].s;
-      h[P] < e ? g -= 1 << e - h[P]++ - 1 : ++t;
+    for (g >>= b; g > 0; ) {
+      var S = o[t].s;
+      v[S] < e ? g -= 1 << e - v[S]++ - 1 : ++t;
     }
     for (; t >= 0 && g; --t) {
       var B = o[t].s;
-      h[B] == e && (--h[B], ++g);
+      v[B] == e && (--v[B], ++g);
     }
     d = e;
   }
-  return { t: new R(h), l: d };
+  return { t: new R(v), l: d };
 }, $e = function(r, e, n) {
   return r.s == -1 ? Math.max($e(r.l, e, n + 1), $e(r.r, e, n + 1)) : e[r.s] = n;
 }, Ke = function(r) {
   for (var e = r.length; e && !r[--e]; )
     ;
-  for (var n = new L(++e), t = 0, s = r[0], o = 1, l = function(a) {
-    n[t++] = a;
-  }, i = 1; i <= e; ++i)
-    if (r[i] == s && i != e)
+  for (var n = new q(++e), t = 0, s = r[0], o = 1, i = function(l) {
+    n[t++] = l;
+  }, a = 1; a <= e; ++a)
+    if (r[a] == s && a != e)
       ++o;
     else {
       if (!s && o > 2) {
         for (; o > 138; o -= 138)
-          l(32754);
-        o > 2 && (l(o > 10 ? o - 11 << 5 | 28690 : o - 3 << 5 | 12305), o = 0);
+          i(32754);
+        o > 2 && (i(o > 10 ? o - 11 << 5 | 28690 : o - 3 << 5 | 12305), o = 0);
       } else if (o > 3) {
-        for (l(s), --o; o > 6; o -= 6)
-          l(8304);
-        o > 2 && (l(o - 3 << 5 | 8208), o = 0);
+        for (i(s), --o; o > 6; o -= 6)
+          i(8304);
+        o > 2 && (i(o - 3 << 5 | 8208), o = 0);
       }
       for (; o--; )
-        l(s);
-      o = 1, s = r[i];
+        i(s);
+      o = 1, s = r[a];
     }
   return { c: n.subarray(0, t), n: e };
-}, we = function(r, e) {
+}, be = function(r, e) {
   for (var n = 0, t = 0; t < e.length; ++t)
     n += r[t] * e[t];
   return n;
-}, ir = function(r, e, n) {
+}, ar = function(r, e, n) {
   var t = n.length, s = Ve(e + 2);
   r[s] = t & 255, r[s + 1] = t >> 8, r[s + 2] = r[s] ^ 255, r[s + 3] = r[s + 1] ^ 255;
   for (var o = 0; o < t; ++o)
     r[s + o + 4] = n[o];
   return (s + 4 + t) * 8;
-}, Qe = function(r, e, n, t, s, o, l, i, a, f, c) {
+}, Qe = function(r, e, n, t, s, o, i, a, l, f, c) {
   _(e, c++, n), ++s[256];
-  for (var u = Ae(s, 15), v = u.t, h = u.l, d = Ae(o, 15), g = d.t, w = d.l, I = Ke(v), y = I.c, P = I.n, B = Ke(g), p = B.c, C = B.n, F = new L(19), b = 0; b < y.length; ++b)
-    ++F[y[b] & 31];
-  for (var b = 0; b < p.length; ++b)
-    ++F[p[b] & 31];
+  for (var u = Ae(s, 15), h = u.t, v = u.l, d = Ae(o, 15), g = d.t, b = d.l, I = Ke(h), y = I.c, S = I.n, B = Ke(g), p = B.c, C = B.n, F = new q(19), w = 0; w < y.length; ++w)
+    ++F[y[w] & 31];
+  for (var w = 0; w < p.length; ++w)
+    ++F[p[w] & 31];
   for (var k = Ae(F, 7), M = k.t, T = k.l, O = 19; O > 4 && !M[We[O - 1]]; --O)
     ;
-  var ee = f + 5 << 3, $ = we(s, te) + we(o, Ie) + l, W = we(s, v) + we(o, g) + l + 14 + 3 * O + we(F, M) + 2 * F[16] + 3 * F[17] + 7 * F[18];
-  if (a >= 0 && ee <= $ && ee <= W)
-    return ir(e, c, r.subarray(a, a + f));
+  var ee = f + 5 << 3, U = be(s, te) + be(o, Ie) + i, W = be(s, h) + be(o, g) + i + 14 + 3 * O + be(F, M) + 2 * F[16] + 3 * F[17] + 7 * F[18];
+  if (l >= 0 && ee <= U && ee <= W)
+    return ar(e, c, r.subarray(l, l + f));
   var E, x, D, A;
-  if (_(e, c, 1 + (W < $)), c += 2, W < $) {
-    E = X(v, h, 0), x = v, D = X(g, w, 0), A = g;
-    var ve = X(M, T, 0);
-    _(e, c, P - 257), _(e, c + 5, C - 1), _(e, c + 10, O - 4), c += 14;
-    for (var b = 0; b < O; ++b)
-      _(e, c + 3 * b, M[We[b]]);
+  if (_(e, c, 1 + (W < U)), c += 2, W < U) {
+    E = X(h, v, 0), x = h, D = X(g, b, 0), A = g;
+    var he = X(M, T, 0);
+    _(e, c, S - 257), _(e, c + 5, C - 1), _(e, c + 10, O - 4), c += 14;
+    for (var w = 0; w < O; ++w)
+      _(e, c + 3 * w, M[We[w]]);
     c += 3 * O;
-    for (var q = [y, p], Z = 0; Z < 2; ++Z)
-      for (var U = q[Z], b = 0; b < U.length; ++b) {
-        var j = U[b] & 31;
-        _(e, c, ve[j]), c += M[j], j > 15 && (_(e, c, U[b] >> 5 & 127), c += U[b] >> 12);
+    for (var G = [y, p], Z = 0; Z < 2; ++Z)
+      for (var L = G[Z], w = 0; w < L.length; ++w) {
+        var j = L[w] & 31;
+        _(e, c, he[j]), c += M[j], j > 15 && (_(e, c, L[w] >> 5 & 127), c += L[w] >> 12);
       }
   } else
-    E = Sr, x = te, D = Br, A = Ie;
-  for (var b = 0; b < i; ++b) {
-    var S = t[b];
-    if (S > 255) {
-      var j = S >> 18 & 31;
-      be(e, c, E[j + 257]), c += x[j + 257], j > 7 && (_(e, c, S >> 23 & 31), c += Fe[j]);
-      var K = S & 31;
-      be(e, c, D[K]), c += A[K], K > 3 && (be(e, c, S >> 5 & 8191), c += Re[K]);
+    E = Pr, x = te, D = Br, A = Ie;
+  for (var w = 0; w < a; ++w) {
+    var P = t[w];
+    if (P > 255) {
+      var j = P >> 18 & 31;
+      we(e, c, E[j + 257]), c += x[j + 257], j > 7 && (_(e, c, P >> 23 & 31), c += Fe[j]);
+      var K = P & 31;
+      we(e, c, D[K]), c += A[K], K > 3 && (we(e, c, P >> 5 & 8191), c += Re[K]);
     } else
-      be(e, c, E[S]), c += x[S];
+      we(e, c, E[P]), c += x[P];
   }
-  return be(e, c, E[256]), c + x[256];
+  return we(e, c, E[256]), c + x[256];
 }, pr = /* @__PURE__ */ new Ge([65540, 131080, 131088, 131104, 262176, 1048704, 1048832, 2114560, 2117632]), cr = /* @__PURE__ */ new R(0), Cr = function(r, e, n, t, s, o) {
-  var l = o.z || r.length, i = new R(t + l + 5 * (1 + Math.ceil(l / 7e3)) + s), a = i.subarray(t, i.length - s), f = o.l, c = (o.r || 0) & 7;
+  var i = o.z || r.length, a = new R(t + i + 5 * (1 + Math.ceil(i / 7e3)) + s), l = a.subarray(t, a.length - s), f = o.l, c = (o.r || 0) & 7;
   if (e) {
-    c && (a[0] = o.r >> 3);
-    for (var u = pr[e - 1], v = u >> 13, h = u & 8191, d = (1 << n) - 1, g = o.p || new L(32768), w = o.h || new L(d + 1), I = Math.ceil(n / 3), y = 2 * I, P = function(Te) {
+    c && (l[0] = o.r >> 3);
+    for (var u = pr[e - 1], h = u >> 13, v = u & 8191, d = (1 << n) - 1, g = o.p || new q(32768), b = o.h || new q(d + 1), I = Math.ceil(n / 3), y = 2 * I, S = function(Te) {
       return (r[Te] ^ r[Te + 1] << I ^ r[Te + 2] << y) & d;
-    }, B = new Ge(25e3), p = new L(288), C = new L(32), F = 0, b = 0, k = o.i || 0, M = 0, T = o.w || 0, O = 0; k + 2 < l; ++k) {
-      var ee = P(k), $ = k & 32767, W = w[ee];
-      if (g[$] = W, w[ee] = $, T <= k) {
-        var E = l - k;
+    }, B = new Ge(25e3), p = new q(288), C = new q(32), F = 0, w = 0, k = o.i || 0, M = 0, T = o.w || 0, O = 0; k + 2 < i; ++k) {
+      var ee = S(k), U = k & 32767, W = b[ee];
+      if (g[U] = W, b[ee] = U, T <= k) {
+        var E = i - k;
         if ((F > 7e3 || M > 24576) && (E > 423 || !f)) {
-          c = Qe(r, a, 0, B, p, C, b, M, O, k - O, c), M = F = b = 0, O = k;
+          c = Qe(r, l, 0, B, p, C, w, M, O, k - O, c), M = F = w = 0, O = k;
           for (var x = 0; x < 286; ++x)
             p[x] = 0;
           for (var x = 0; x < 30; ++x)
             C[x] = 0;
         }
-        var D = 2, A = 0, ve = h, q = $ - W & 32767;
-        if (E > 2 && ee == P(k - q))
-          for (var Z = Math.min(v, E) - 1, U = Math.min(32767, k), j = Math.min(258, E); q <= U && --ve && $ != W; ) {
-            if (r[k + D] == r[k + D - q]) {
-              for (var S = 0; S < j && r[k + S] == r[k + S - q]; ++S)
+        var D = 2, A = 0, he = v, G = U - W & 32767;
+        if (E > 2 && ee == S(k - G))
+          for (var Z = Math.min(h, E) - 1, L = Math.min(32767, k), j = Math.min(258, E); G <= L && --he && U != W; ) {
+            if (r[k + D] == r[k + D - G]) {
+              for (var P = 0; P < j && r[k + P] == r[k + P - G]; ++P)
                 ;
-              if (S > D) {
-                if (D = S, A = q, S > Z)
+              if (P > D) {
+                if (D = P, A = G, P > Z)
                   break;
-                for (var K = Math.min(q, S - 2), ie = 0, x = 0; x < K; ++x) {
-                  var ce = k - q + x & 32767, ye = g[ce], xe = ce - ye & 32767;
-                  xe > ie && (ie = xe, W = ce);
+                for (var K = Math.min(G, P - 2), ae = 0, x = 0; x < K; ++x) {
+                  var ce = k - G + x & 32767, ye = g[ce], xe = ce - ye & 32767;
+                  xe > ae && (ae = xe, W = ce);
                 }
               }
             }
-            $ = W, W = g[$], q += $ - W & 32767;
+            U = W, W = g[U], G += U - W & 32767;
           }
         if (A) {
           B[M++] = 268435456 | De[D] << 18 | Je[A];
-          var he = De[D] & 31, de = Je[A] & 31;
-          b += Fe[he] + Re[de], ++p[257 + he], ++C[de], T = k + D, ++F;
+          var ve = De[D] & 31, de = Je[A] & 31;
+          w += Fe[ve] + Re[de], ++p[257 + ve], ++C[de], T = k + D, ++F;
         } else
           B[M++] = r[k], ++p[r[k]];
       }
     }
-    for (k = Math.max(k, T); k < l; ++k)
+    for (k = Math.max(k, T); k < i; ++k)
       B[M++] = r[k], ++p[r[k]];
-    c = Qe(r, a, f, B, p, C, b, M, O, k - O, c), f || (o.r = c & 7 | a[c / 8 | 0] << 3, c -= 7, o.h = w, o.p = g, o.i = k, o.w = T);
+    c = Qe(r, l, f, B, p, C, w, M, O, k - O, c), f || (o.r = c & 7 | l[c / 8 | 0] << 3, c -= 7, o.h = b, o.p = g, o.i = k, o.w = T);
   } else {
-    for (var k = o.w || 0; k < l + f; k += 65535) {
+    for (var k = o.w || 0; k < i + f; k += 65535) {
       var fe = k + 65535;
-      fe >= l && (a[c / 8 | 0] = f, fe = l), c = ir(a, c + 1, r.subarray(k, fe));
+      fe >= i && (l[c / 8 | 0] = f, fe = i), c = ar(l, c + 1, r.subarray(k, fe));
     }
-    o.i = l;
+    o.i = i;
   }
-  return me(i, 0, t + Ve(c) + s);
+  return me(a, 0, t + Ve(c) + s);
 }, Mr = /* @__PURE__ */ (function() {
   for (var r = new Int32Array(256), e = 0; e < 256; ++e) {
     for (var n = e, t = 9; --t; )
@@ -1085,8 +1106,8 @@ var Sr = /* @__PURE__ */ X(te, 9, 0), Pr = /* @__PURE__ */ X(te, 9, 1), Br = /*
   };
 }, Ar = function(r, e, n, t, s) {
   if (!s && (s = { l: 1 }, e.dictionary)) {
-    var o = e.dictionary.subarray(-32768), l = new R(o.length + r.length);
-    l.set(o), l.set(r, o.length), r = l, s.w = o.length;
+    var o = e.dictionary.subarray(-32768), i = new R(o.length + r.length);
+    i.set(o), i.set(r, o.length), r = i, s.w = o.length;
   }
   return Cr(r, e.level == null ? 6 : e.level, e.mem == null ? s.l ? Math.ceil(Math.max(8, Math.min(13, Math.log(r.length))) * 1.5) : 20 : 12 + e.mem, n, t, s);
 }, fr = function(r, e) {
@@ -1114,8 +1135,8 @@ function Or(r, e) {
 }
 var ur = function(r, e, n, t) {
   for (var s in r) {
-    var o = r[s], l = e + s, i = t;
-    Array.isArray(o) && (i = fr(t, o[1]), o = o[0]), ArrayBuffer.isView(o) ? n[l] = [o, i] : (n[l += "/"] = [new R(0), i], ur(o, l, n, t));
+    var o = r[s], i = e + s, a = t;
+    Array.isArray(o) && (a = fr(t, o[1]), o = o[0]), ArrayBuffer.isView(o) ? n[i] = [o, a] : (n[i += "/"] = [new R(0), a], ur(o, i, n, t));
   }
 }, Xe = typeof TextEncoder < "u" && /* @__PURE__ */ new TextEncoder(), Ue = typeof TextDecoder < "u" && /* @__PURE__ */ new TextDecoder(), Nr = 0;
 try {
@@ -1134,15 +1155,15 @@ function Ze(r, e) {
   var n;
   if (Xe)
     return Xe.encode(r);
-  for (var t = r.length, s = new R(r.length + (r.length >> 1)), o = 0, l = function(f) {
+  for (var t = r.length, s = new R(r.length + (r.length >> 1)), o = 0, i = function(f) {
     s[o++] = f;
   }, n = 0; n < t; ++n) {
     if (o + 5 > s.length) {
-      var i = new R(o + 8 + (t - n << 1));
-      i.set(s), s = i;
+      var a = new R(o + 8 + (t - n << 1));
+      a.set(s), s = a;
     }
-    var a = r.charCodeAt(n);
-    a < 128 || e ? l(a) : a < 2048 ? (l(192 | a >> 6), l(128 | a & 63)) : a > 55295 && a < 57344 ? (a = 65536 + (a & 1047552) | r.charCodeAt(++n) & 1023, l(240 | a >> 18), l(128 | a >> 12 & 63), l(128 | a >> 6 & 63), l(128 | a & 63)) : (l(224 | a >> 12), l(128 | a >> 6 & 63), l(128 | a & 63));
+    var l = r.charCodeAt(n);
+    l < 128 || e ? i(l) : l < 2048 ? (i(192 | l >> 6), i(128 | l & 63)) : l > 55295 && l < 57344 ? (l = 65536 + (l & 1047552) | r.charCodeAt(++n) & 1023, i(240 | l >> 18), i(128 | l >> 12 & 63), i(128 | l >> 6 & 63), i(128 | l & 63)) : (i(224 | l >> 12), i(128 | l >> 6 & 63), i(128 | l & 63));
   }
   return me(s, 0, o);
 }
@@ -1161,23 +1182,23 @@ function Dr(r, e) {
 var Hr = function(r, e) {
   return e + 30 + Q(r, e + 26) + Q(r, e + 28);
 }, $r = function(r, e, n) {
-  var t = Q(r, e + 28), s = Q(r, e + 30), o = Dr(r.subarray(e + 46, e + 46 + t), !(Q(r, e + 8) & 2048)), l = e + 46 + t, i = Ur(r, l, s, n, V(r, e + 20), V(r, e + 24), V(r, e + 42)), a = i[0], f = i[1], c = i[2];
-  return [Q(r, e + 10), a, f, o, l + s + Q(r, e + 32), c];
-}, Ur = function(r, e, n, t, s, o, l) {
-  var i = s == 4294967295, a = o == 4294967295, f = l == 4294967295, c = e + n, u = i + a + f;
+  var t = Q(r, e + 28), s = Q(r, e + 30), o = Dr(r.subarray(e + 46, e + 46 + t), !(Q(r, e + 8) & 2048)), i = e + 46 + t, a = Ur(r, i, s, n, V(r, e + 20), V(r, e + 24), V(r, e + 42)), l = a[0], f = a[1], c = a[2];
+  return [Q(r, e + 10), l, f, o, i + s + Q(r, e + 32), c];
+}, Ur = function(r, e, n, t, s, o, i) {
+  var a = s == 4294967295, l = o == 4294967295, f = i == 4294967295, c = e + n, u = a + l + f;
   if (t && u) {
     for (; e + 4 < c; e += 4 + Q(r, e + 2))
       if (Q(r, e) == 1)
         return [
-          i ? ze(r, e + 4 + 8 * a) : s,
-          a ? ze(r, e + 4) : o,
-          f ? ze(r, e + 4 + 8 * (a + i)) : l,
+          a ? ze(r, e + 4 + 8 * l) : s,
+          l ? ze(r, e + 4) : o,
+          f ? ze(r, e + 4 + 8 * (l + a)) : i,
           1
         ];
     t < 2 && N(13);
   }
-  return [s, o, l, 0];
-}, je = function(r) {
+  return [s, o, i, 0];
+}, Le = function(r) {
   var e = 0;
   if (r)
     for (var n in r) {
@@ -1185,17 +1206,17 @@ var Hr = function(r, e) {
       t > 65535 && N(9), e += t + 4;
     }
   return e;
-}, _e = function(r, e, n, t, s, o, l, i) {
-  var a = t.length, f = n.extra, c = i && i.length, u = je(f);
-  z(r, e, l != null ? 33639248 : 67324752), e += 4, l != null && (r[e++] = 20, r[e++] = n.os), r[e] = 20, e += 2, r[e++] = n.flag << 1 | (o < 0 && 8), r[e++] = s && 8, r[e++] = n.compression & 255, r[e++] = n.compression >> 8;
-  var v = new Date(n.mtime == null ? Date.now() : n.mtime), h = v.getFullYear() - 1980;
-  if ((h < 0 || h > 119) && N(10), z(r, e, h << 25 | v.getMonth() + 1 << 21 | v.getDate() << 16 | v.getHours() << 11 | v.getMinutes() << 5 | v.getSeconds() >> 1), e += 4, o != -1 && (z(r, e, n.crc), z(r, e + 4, o < 0 ? -o - 2 : o), z(r, e + 8, n.size)), z(r, e + 12, a), z(r, e + 14, u), e += 16, l != null && (z(r, e, c), z(r, e + 6, n.attrs), z(r, e + 10, l), e += 14), r.set(t, e), e += a, u)
+}, _e = function(r, e, n, t, s, o, i, a) {
+  var l = t.length, f = n.extra, c = a && a.length, u = Le(f);
+  z(r, e, i != null ? 33639248 : 67324752), e += 4, i != null && (r[e++] = 20, r[e++] = n.os), r[e] = 20, e += 2, r[e++] = n.flag << 1 | (o < 0 && 8), r[e++] = s && 8, r[e++] = n.compression & 255, r[e++] = n.compression >> 8;
+  var h = new Date(n.mtime == null ? Date.now() : n.mtime), v = h.getFullYear() - 1980;
+  if ((v < 0 || v > 119) && N(10), z(r, e, v << 25 | h.getMonth() + 1 << 21 | h.getDate() << 16 | h.getHours() << 11 | h.getMinutes() << 5 | h.getSeconds() >> 1), e += 4, o != -1 && (z(r, e, n.crc), z(r, e + 4, o < 0 ? -o - 2 : o), z(r, e + 8, n.size)), z(r, e + 12, l), z(r, e + 14, u), e += 16, i != null && (z(r, e, c), z(r, e + 6, n.attrs), z(r, e + 10, i), e += 14), r.set(t, e), e += l, u)
     for (var d in f) {
-      var g = f[d], w = g.length;
-      z(r, e, +d), z(r, e + 2, w), r.set(g, e + 4), e += 4 + w;
+      var g = f[d], b = g.length;
+      z(r, e, +d), z(r, e + 2, b), r.set(g, e + 4), e += 4 + b;
     }
-  return c && (r.set(i, e), e += c), e;
-}, jr = function(r, e, n, t, s) {
+  return c && (r.set(a, e), e += c), e;
+}, Lr = function(r, e, n, t, s) {
   z(r, e, 101010256), z(r, e + 8, n), z(r, e + 10, n), z(r, e + 12, t), z(r, e + 16, s);
 };
 function rn(r, e) {
@@ -1203,28 +1224,28 @@ function rn(r, e) {
   var n = {}, t = [];
   ur(r, "", n, e);
   var s = 0, o = 0;
-  for (var l in n) {
-    var i = n[l], a = i[0], f = i[1], c = f.level == 0 ? 0 : 8, u = Ze(l), v = u.length, h = f.comment, d = h && Ze(h), g = d && d.length, w = je(f.extra);
-    v > 65535 && N(11);
-    var I = c ? zr(a, f) : a, y = I.length, P = Er();
-    P.p(a), t.push(fr(f, {
-      size: a.length,
-      crc: P.d(),
+  for (var i in n) {
+    var a = n[i], l = a[0], f = a[1], c = f.level == 0 ? 0 : 8, u = Ze(i), h = u.length, v = f.comment, d = v && Ze(v), g = d && d.length, b = Le(f.extra);
+    h > 65535 && N(11);
+    var I = c ? zr(l, f) : l, y = I.length, S = Er();
+    S.p(l), t.push(fr(f, {
+      size: l.length,
+      crc: S.d(),
       c: I,
       f: u,
       m: d,
-      u: v != l.length || d && h.length != g,
+      u: h != i.length || d && v.length != g,
       o: s,
       compression: c
-    })), s += 30 + v + w + y, o += 76 + 2 * (v + w) + (g || 0) + y;
+    })), s += 30 + h + b + y, o += 76 + 2 * (h + b) + (g || 0) + y;
   }
   for (var B = new R(o + 22), p = s, C = o - s, F = 0; F < t.length; ++F) {
     var u = t[F];
     _e(B, u.o, u, u.f, u.u, u.c.length);
-    var b = 30 + u.f.length + je(u.extra);
-    B.set(u.c, u.o + b), _e(B, s, u, u.f, u.u, u.c.length, u.o, u.m), s += 16 + b + (u.m ? u.m.length : 0);
+    var w = 30 + u.f.length + Le(u.extra);
+    B.set(u.c, u.o + w), _e(B, s, u, u.f, u.u, u.c.length, u.o, u.m), s += 16 + w + (u.m ? u.m.length : 0);
   }
-  return jr(B, s, t.length, C, p), B;
+  return Lr(B, s, t.length, C, p), B;
 }
 function nn(r, e) {
   for (var n = {}, t = r.length - 22; V(r, t) != 101010256; --t)
@@ -1232,53 +1253,53 @@ function nn(r, e) {
   var s = Q(r, t + 8);
   if (!s)
     return {};
-  var o = V(r, t + 16), l = V(r, t - 20) == 117853008;
-  if (l) {
-    var i = V(r, t - 12);
-    l = V(r, i) == 101075792, l && (s = V(r, i + 32), o = V(r, i + 48));
+  var o = V(r, t + 16), i = V(r, t - 20) == 117853008;
+  if (i) {
+    var a = V(r, t - 12);
+    i = V(r, a) == 101075792, i && (s = V(r, a + 32), o = V(r, a + 48));
   }
-  for (var a = e && e.filter, f = 0; f < s; ++f) {
-    var c = $r(r, o, l), u = c[0], v = c[1], h = c[2], d = c[3], g = c[4], w = c[5], I = Hr(r, w);
-    o = g, (!a || a({
+  for (var l = e && e.filter, f = 0; f < s; ++f) {
+    var c = $r(r, o, i), u = c[0], h = c[1], v = c[2], d = c[3], g = c[4], b = c[5], I = Hr(r, b);
+    o = g, (!l || l({
       name: d,
-      size: v,
-      originalSize: h,
+      size: h,
+      originalSize: v,
       compression: u
-    })) && (u ? u == 8 ? n[d] = Or(r.subarray(I, I + v), { out: new R(h) }) : N(14, "unknown compression type " + u) : n[d] = me(r, I, I + v));
+    })) && (u ? u == 8 ? n[d] = Or(r.subarray(I, I + h), { out: new R(v) }) : N(14, "unknown compression type " + u) : n[d] = me(r, I, I + h));
   }
   return n;
 }
 export {
   ne as A,
-  Le as B,
-  vr as C,
+  je as B,
+  hr as C,
   Qr as D,
   Xr as E,
   Ce as F,
   Dr as a,
   en as b,
-  hr as c,
+  vr as c,
   Zr as d,
   Gr as e,
   dr as f,
   yr as g,
-  H as h,
+  $ as h,
   Vr as i,
   tr as j,
   Jr as k,
-  Pe as l,
+  Se as l,
   _r as m,
   Yr as n,
   qe as o,
   nr as p,
-  Lr as q,
-  gr as r,
+  mr as q,
+  jr as r,
   Ze as s,
   Ne as t,
   nn as u,
-  Kr as v,
+  gr as v,
   rr as w,
-  mr as x,
+  Kr as x,
   qr as y,
   rn as z
 };