@reportwright/cli 0.13.1 → 0.13.2-rc.2

package/dist/pw.mjs

@@ -5415,18 +5415,18 @@ function fontsForDef(def, unknown = void 0) {
   const keys = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
   const baseFamily = def?.styles?.base?.fontFamily;
-  const walk = (o) => {
+  const walk2 = (o) => {
     if (!o || typeof o !== "object" || seen.has(o)) return;
     seen.add(o);
     if (Array.isArray(o)) {
-      for (const x of o) walk(x);
+      for (const x of o) walk2(x);
       return;
     }
     if (o.fontFamily != null || o.fontWeight != null || o.fontStyle != null) keys.add(resolveFontKey(o.fontFamily ?? baseFamily, o.fontWeight, o.fontStyle, unknown));
     if (o.type === "chart") keys.add(resolveFontKey(o.fontFamily ?? baseFamily, "bold", "normal"));
-    for (const [k, v] of Object.entries(o)) if (v && typeof v === "object" && k !== "dataSources" && k !== "data") walk(v);
+    for (const [k, v] of Object.entries(o)) if (v && typeof v === "object" && k !== "dataSources" && k !== "data") walk2(v);
   };
-  walk(def);
+  walk2(def);
   return [...keys];
 }
 function fontsFor(texts) {
@@ -7126,8 +7126,8 @@ function formatDate(d, fmt2, locale, tz) {
     return localName(locale, "month", style, w) ?? fallback;
   };
   const p2 = (n5) => String(n5).padStart(2, "0");
-  return fmt2.replace(/(y+|M+|d+|H+|h+|m+|s+|f+|F+|t+|z+|\/)|'([^']*)'?|"([^"]*)"?|\\(.?)/g, (tok, run, q1, q22, esc8) => {
-    if (!run) return q1 ?? q22 ?? esc8 ?? "";
+  return fmt2.replace(/(y+|M+|d+|H+|h+|m+|s+|f+|F+|t+|z+|\/)|'([^']*)'?|"([^"]*)"?|\\(.?)/g, (tok, run, q1, q22, esc9) => {
+    if (!run) return q1 ?? q22 ?? esc9 ?? "";
     const n5 = run.length;
     switch (run[0]) {
       case "y": {
@@ -7728,8 +7728,8 @@ function rowLocal(ast) {
       const k = n5.name.toLowerCase();
       return !n5.obj && (k in FUNCTIONS || k === "iif" || k === "switch" || k === "choose" || k === "lookup" || k === "lookupset");
     };
-    const walk = (n5) => !n5 || typeof n5 !== "object" || (Array.isArray(n5) ? n5.every(walk) : local(n5) && Object.values(n5).every(walk));
-    r = walk(ast);
+    const walk2 = (n5) => !n5 || typeof n5 !== "object" || (Array.isArray(n5) ? n5.every(walk2) : local(n5) && Object.values(n5).every(walk2));
+    r = walk2(ast);
     ROW_LOCAL.set(ast, r);
   }
   return r;
@@ -7801,8 +7801,8 @@ function aggregator(name, ctx) {
 function pureRows(ast) {
   let r = PURE_ROWS.get(ast);
   if (r === void 0) {
-    const walk = (n5) => !n5 || typeof n5 !== "object" || (Array.isArray(n5) ? n5.every(walk) : !(n5.type === "id" && ["globals", "parent", "partproperties"].includes(n5.name.toLowerCase())) && Object.values(n5).every(walk));
-    r = rowLocal(ast) && walk(ast);
+    const walk2 = (n5) => !n5 || typeof n5 !== "object" || (Array.isArray(n5) ? n5.every(walk2) : !(n5.type === "id" && ["globals", "parent", "partproperties"].includes(n5.name.toLowerCase())) && Object.values(n5).every(walk2));
+    r = rowLocal(ast) && walk2(ast);
     PURE_ROWS.set(ast, r);
   }
   return r;
@@ -8055,7 +8055,7 @@ function pad(fname, s, width, c, left) {
 function jasperValue(n5, ctx) {
   const a = n5.args;
   if (a.length < 6) throw new ExprError("JasperValue needs a data set, a calculation, an expression, a time, a reset and an end", n5.p);
-  const ds = String(evaluate(a[0], ctx)), at2 = String(evaluate(a[3], ctx)).toLowerCase();
+  const ds = String(evaluate(a[0], ctx)), at3 = String(evaluate(a[3], ctx)).toLowerCase();
   const [calc, incrS] = String(evaluate(a[1], ctx)).toLowerCase().split("@");
   const incr = incrS ? Math.trunc(Number(incrS)) || 0 : 0;
   const reset = Math.trunc(Number(evaluate(a[4], ctx))) || 0, end = Math.trunc(Number(evaluate(a[5], ctx)));
@@ -8077,18 +8077,18 @@ function jasperValue(n5, ctx) {
   const N = rows.length;
   const posOf = (r) => r ? info.pos.get(r) : void 0;
   let anchor;
-  if (at2 === "detail") anchor = posOf(ctx.fields);
-  else if (at2 === "header") anchor = posOf(ctx.aggRows?.[0]);
-  else if (at2 === "footer") anchor = posOf(ctx.aggRows?.[ctx.aggRows.length - 1]);
-  else if (at2 === "start") anchor = -1;
+  if (at3 === "detail") anchor = posOf(ctx.fields);
+  else if (at3 === "header") anchor = posOf(ctx.aggRows?.[0]);
+  else if (at3 === "footer") anchor = posOf(ctx.aggRows?.[ctx.aggRows.length - 1]);
+  else if (at3 === "start") anchor = -1;
   else anchor = N - 1;
   if (anchor === void 0) return null;
   let b;
   if (end === 0) b = N - 1;
   else if (end > 0) b = N ? info.end[end][Math.max(0, anchor)] : -1;
-  else b = at2 === "header" ? anchor - 1 : anchor;
+  else b = at3 === "header" ? anchor - 1 : anchor;
   if (b < 0) return calc === "rows" ? 0 : null;
-  if (end < 0 && at2 === "header" && reset > 0 && info.start[reset][anchor] > b) return calc === "rows" ? 0 : null;
+  if (end < 0 && at3 === "header" && reset > 0 && info.start[reset][anchor] > b) return calc === "rows" ? 0 : null;
   const vk = `v|${astId(a[2])}|${calc}|${reset}|${incr}|${kid}`;
   let vals = byRows.get(vk);
   if (!vals) {
@@ -8378,10 +8378,10 @@ function callIssues(ast, custom, suggest) {
     }
   };
   const known = () => [...FUNCTION_NAMES, ...Object.keys(FUNCTIONS)];
-  const walk = (n5, depth) => {
+  const walk2 = (n5, depth) => {
     if (!n5 || typeof n5 !== "object" || depth > 200) return;
     if (Array.isArray(n5)) {
-      for (const x of n5) walk(x, depth + 1);
+      for (const x of n5) walk2(x, depth + 1);
       return;
     }
     if (n5.type === "call") {
@@ -8394,9 +8394,9 @@ function callIssues(ast, custom, suggest) {
       } else if (isCode && !custom.has(lower)) say(`code.${lower}`, `The report has no function "${n5.name}" (Code.${n5.name})`);
       else if (n5.obj && !isCode && !isString && !METHODS[lower]) say(`.${lower}`, `"${n5.name}(…)" after "." is not supported`);
     }
-    for (const k in n5) if (k !== "p" && n5[k] && typeof n5[k] === "object") walk(n5[k], depth + 1);
+    for (const k in n5) if (k !== "p" && n5[k] && typeof n5[k] === "object") walk2(n5[k], depth + 1);
   };
-  walk(ast, 0);
+  walk2(ast, 0);
   return out;
 }
 function checkFunctions(list2) {
@@ -9270,8 +9270,8 @@ function fetchFailure(e2, input) {
   const code = String(e2.cause?.code || e2.code || "");
   if (!code && e2.message !== "fetch failed") return e2;
   const why = CAUSES[code] || (/^ERR_TLS|CERT_|SSL/.test(code) ? "TLS error" : "");
-  const at2 = redactUrl(input?.href ?? input);
-  return Object.assign(new Error(`the request to ${at2} failed${why ? `: ${why}` : ""}${code ? ` (${code})` : ""}`), { code: e2.code });
+  const at3 = redactUrl(input?.href ?? input);
+  return Object.assign(new Error(`the request to ${at3} failed${why ? `: ${why}` : ""}${code ? ` (${code})` : ""}`), { code: e2.code });
 }
 function anySignal(list2) {
   const S3 = (
@@ -9330,7 +9330,7 @@ var init_guard = __esm({
 });
 
 // src/importers/xml.js
-function decode(s, at2) {
+function decode(s, at3) {
   if (!s.includes("&")) return s;
   let out = "", i = 0;
   for (; ; ) {
@@ -9338,7 +9338,7 @@ function decode(s, at2) {
     if (amp < 0) return out + s.slice(i);
     out += s.slice(i, amp);
     const semi = s.indexOf(";", amp);
-    if (semi < 0 || semi - amp > 12) throw new XmlError(`A "&" that does not start a reference, near character ${at2 + amp}`);
+    if (semi < 0 || semi - amp > 12) throw new XmlError(`A "&" that does not start a reference, near character ${at3 + amp}`);
     const ref2 = s.slice(amp + 1, semi);
     if (ref2[0] === "#") {
       const hex6 = ref2[1] === "x" || ref2[1] === "X";
@@ -9355,20 +9355,21 @@ function parseXml(src, limits = {}) {
   const L = { ...XML_LIMITS, ...limits };
   if (typeof src !== "string") throw new XmlError("The file is not text");
   if (src.length > L.maxChars) throw new XmlError(`The file is too large (more than ${L.maxChars} characters)`);
-  if (src.charCodeAt(0) === 65279) src = src.slice(1);
+  const bom = src.charCodeAt(0) === 65279 ? 1 : 0;
+  if (bom) src = src.slice(1);
   const stack2 = [];
   const nsStack = [Object.assign(/* @__PURE__ */ Object.create(null), { xml: "http://www.w3.org/XML/1998/namespace" })];
   let root = null;
   let count = 0, i = 0;
   const n5 = src.length;
-  const fail2 = (msg, at2 = i) => {
-    throw new XmlError(`${msg} (character ${at2})`);
+  const fail2 = (msg, at3 = i) => {
+    throw new XmlError(`${msg} (character ${at3})`);
   };
-  const addText = (t, at2) => {
+  const addText = (t, at3) => {
     if (!t) return;
     const top = stack2[stack2.length - 1];
     if (top) top.text += t;
-    else for (let k = 0; k < t.length; k++) if (!isSpace(t[k])) fail2("Text outside the root element", at2 + k);
+    else for (let k = 0; k < t.length; k++) if (!isSpace(t[k])) fail2("Text outside the root element", at3 + k);
   };
   while (i < n5) {
     const lt = src.indexOf("<", i);
@@ -9471,7 +9472,7 @@ function parseXml(src, limits = {}) {
     const colon = qname.indexOf(":");
     const prefix = colon < 0 ? "" : qname.slice(0, colon);
     const ns = scope[prefix] ?? (prefix ? fail2(`The prefix "${prefix}" is not declared`) : "");
-    const el = { name: colon < 0 ? qname : qname.slice(colon + 1), ns, attrs: attrsOut, children: [], text: "" };
+    const el = { name: colon < 0 ? qname : qname.slice(colon + 1), ns, attrs: attrsOut, children: [], text: "", pos: i + bom };
     if (stack2.length) stack2[stack2.length - 1].children.push(el);
     else root = el;
     if (!selfClose) {
@@ -9521,15 +9522,15 @@ function soapBody(text2, src = {}) {
   DOCS.add(out);
   return out;
 }
-function compileXPath(path2) {
-  path2 = String(path2 ?? "").trim();
-  const hit = pathCache.get(path2);
+function compileXPath(path3) {
+  path3 = String(path3 ?? "").trim();
+  const hit = pathCache.get(path3);
   if (hit) return hit;
-  if (path2.length > XPATH_MAX) throw new Error(`The XPath is longer than ${XPATH_MAX} characters`);
-  if (!path2) throw new Error("Give an XPath");
+  if (path3.length > XPATH_MAX) throw new Error(`The XPath is longer than ${XPATH_MAX} characters`);
+  if (!path3) throw new Error("Give an XPath");
   const parts = [];
   let cur = "", depth = 0, q3 = "";
-  for (const c of path2) {
+  for (const c of path3) {
     if (q3) {
       if (c === q3) q3 = "";
       cur += c;
@@ -9549,7 +9550,7 @@ function compileXPath(path2) {
     }
     cur += c;
   }
-  if (q3 || depth) throw new Error(`The XPath "${path2}" has an unclosed quote or [`);
+  if (q3 || depth) throw new Error(`The XPath "${path3}" has an unclosed quote or [`);
   parts.push(cur);
   const abs = parts[0] === "";
   if (abs) parts.shift();
@@ -9558,30 +9559,30 @@ function compileXPath(path2) {
   for (let k = 0; k < parts.length; k++) {
     const p = parts[k].trim();
     if (p === "") {
-      if (desc || k === parts.length - 1) throw new Error(`The XPath "${path2}" has an empty step`);
+      if (desc || k === parts.length - 1) throw new Error(`The XPath "${path3}" has an empty step`);
       desc = true;
       continue;
     }
-    steps.push(step(p, desc, path2));
+    steps.push(step(p, desc, path3));
     desc = false;
   }
-  if (!steps.length) throw new Error(`The XPath "${path2}" has no steps`);
+  if (!steps.length) throw new Error(`The XPath "${path3}" has no steps`);
   steps.forEach((s, k) => {
-    if ((s.test.kind === "attr" || s.test.kind === "text") && k < steps.length - 1) throw new Error(`In "${path2}", @attribute and text() must come last`);
+    if ((s.test.kind === "attr" || s.test.kind === "text") && k < steps.length - 1) throw new Error(`In "${path3}", @attribute and text() must come last`);
   });
   const out = { abs, steps };
   if (pathCache.size > 500) pathCache.clear();
-  pathCache.set(path2, out);
+  pathCache.set(path3, out);
   return out;
 }
-function step(p, desc, path2) {
+function step(p, desc, path3) {
   const b = p.indexOf("[");
   const head = (b < 0 ? p : p.slice(0, b)).trim();
   const preds = [];
   if (b >= 0) {
     let rest2 = p.slice(b);
     while (rest2) {
-      if (rest2[0] !== "[") throw new Error(`The XPath "${path2}": text after a predicate`);
+      if (rest2[0] !== "[") throw new Error(`The XPath "${path3}": text after a predicate`);
       let k = 1, q3 = "";
       for (; k < rest2.length; k++) {
         const c = rest2[k];
@@ -9590,7 +9591,7 @@ function step(p, desc, path2) {
         } else if (c === "'" || c === '"') q3 = c;
         else if (c === "]") break;
       }
-      preds.push(pred(rest2.slice(1, k).trim(), path2));
+      preds.push(pred(rest2.slice(1, k).trim(), path3));
       rest2 = rest2.slice(k + 1).trim();
     }
   }
@@ -9600,29 +9601,29 @@ function step(p, desc, path2) {
   else if (head === "text()") test = { kind: "text" };
   else if (head.startsWith("@")) {
     const m = NAME.exec(head.slice(1));
-    if (!m) throw new Error(`The XPath "${path2}": "${head}" is not an attribute name`);
+    if (!m) throw new Error(`The XPath "${path3}": "${head}" is not an attribute name`);
     test = { kind: "attr", local: m[2] };
   } else {
     const m = NAME.exec(head);
-    if (!m) throw new Error(`The XPath "${path2}": "${head}" is not supported (names, *, ., .., @attr, text() and simple [predicates] are)`);
+    if (!m) throw new Error(`The XPath "${path3}": "${head}" is not supported (names, *, ., .., @attr, text() and simple [predicates] are)`);
     test = { kind: "name", prefix: m[1] || "", local: m[2] };
   }
-  if (preds.length && test.kind !== "name") throw new Error(`The XPath "${path2}": a predicate goes on an element step`);
+  if (preds.length && test.kind !== "name") throw new Error(`The XPath "${path3}": a predicate goes on an element step`);
   return { desc, test, preds };
 }
-function pred(s, path2) {
+function pred(s, path3) {
   if (/^\d+$/.test(s)) {
     const n5 = Number(s);
-    if (n5 < 1) throw new Error(`The XPath "${path2}": positions start at 1`);
+    if (n5 < 1) throw new Error(`The XPath "${path3}": positions start at 1`);
     return { pos: n5 };
   }
   if (s === "last()") return { last: true };
   const m = /^(@?[A-Za-z_][\w.:-]*|text\(\)|\.)\s*(?:(!?=)\s*(.+))?$/.exec(s);
-  if (!m) throw new Error(`The XPath "${path2}": the predicate [${s}] is not supported`);
+  if (!m) throw new Error(`The XPath "${path3}": the predicate [${s}] is not supported`);
   let value = null;
   if (m[2]) {
     const l = LIT.exec(m[3].trim());
-    if (!l) throw new Error(`The XPath "${path2}": compare with a quoted value in [${s}]`);
+    if (!l) throw new Error(`The XPath "${path3}": compare with a quoted value in [${s}]`);
     value = l[1] ?? l[2] ?? l[3];
   }
   const what = m[1];
@@ -9661,8 +9662,8 @@ function stringValue(el) {
   }
   return s.trim();
 }
-function selectXml(doc, path2, context) {
-  const { abs, steps } = compileXPath(path2);
+function selectXml(doc, path3, context) {
+  const { abs, steps } = compileXPath(path3);
   const root = doc.$xml;
   const DOC = { name: "#document", ns: "", attrs: {}, children: [root], text: "" };
   let cur = abs ? [DOC] : [context || root];
@@ -9731,8 +9732,8 @@ function filterPred(list2, p) {
     return p.op === "=" ? eq : vals.length > 0 && !eq;
   });
 }
-function xmlValue(doc, el, path2) {
-  const r = selectXml(doc, path2, el)[0];
+function xmlValue(doc, el, path3) {
+  const r = selectXml(doc, path3, el)[0];
   return r == null ? null : typeof r === "string" ? r : stringValue(r);
 }
 function xmlObject(el) {
@@ -9764,14 +9765,14 @@ function xmlRowPaths(doc) {
   const seen = /* @__PURE__ */ new Map();
   const stack2 = [{ e: doc.$xml, path: `/${doc.$xml.name}`, depth: 0 }];
   while (stack2.length) {
-    const { e: e2, path: path2, depth } = (
+    const { e: e2, path: path3, depth } = (
       /** @type {any} */
       stack2.pop()
     );
     const counts = /* @__PURE__ */ new Map();
     for (const c of e2.children) counts.set(c.name, (counts.get(c.name) || 0) + 1);
     for (const c of e2.children) {
-      const p = `${path2}/${c.name}`;
+      const p = `${path3}/${c.name}`;
       let s = seen.get(p);
       if (!s) seen.set(p, s = { rows: 0, repeats: false, fields: /* @__PURE__ */ new Set(), depth: depth + 1 });
       s.rows++;
@@ -9784,14 +9785,14 @@ function xmlRowPaths(doc) {
       if (c.children.length) stack2.push({ e: c, path: p, depth: depth + 1 });
     }
   }
-  return [...seen].filter(([, s]) => s.repeats).map(([path2, s]) => ({ path: path2, rows: s.rows, objects: true, fields: [...s.fields], spreads: s.depth }));
+  return [...seen].filter(([, s]) => s.repeats).map(([path3, s]) => ({ path: path3, rows: s.rows, objects: true, fields: [...s.fields], spreads: s.depth }));
 }
 function bestXmlRows(doc) {
   const list2 = xmlRowPaths(doc).sort((a, b) => b.rows - a.rows || a.spreads - b.spreads);
   return list2[0] || null;
 }
-function xmlRows(doc, path2) {
-  let p = path2 && path2 !== "$" ? path2 : bestXmlRows(doc)?.path;
+function xmlRows(doc, path3) {
+  let p = path3 && path3 !== "$" ? path3 : bestXmlRows(doc)?.path;
   if (!p) return { els: [doc.$xml], rows: [xmlObject(doc.$xml)] };
   const found = selectXml(doc, p);
   const els = found.filter((x) => typeof x !== "string");
@@ -9914,23 +9915,23 @@ var init_odata = __esm({
 });
 
 // src/engine/data/index.js
-function pathTokens(path2) {
+function pathTokens(path3) {
   const toks = [];
   const re = /\.([A-Za-z_$][\w$]*)|\[(\d+|\*)\]|\['([^']+)'\]|\["([^"]+)"\]/g;
-  const p = path2.startsWith("$") ? path2.slice(1) : "." + path2;
+  const p = path3.startsWith("$") ? path3.slice(1) : "." + path3;
   let m, last = 0;
   while (m = re.exec(p)) {
-    if (m.index !== last) throw new Error(`Bad data path "${path2}"`);
+    if (m.index !== last) throw new Error(`Bad data path "${path3}"`);
     toks.push(m[1] ?? m[3] ?? m[4] ?? (m[2] === "*" ? "*" : Number(m[2])));
     last = re.lastIndex;
   }
-  if (last !== p.length) throw new Error(`Bad data path "${path2}"`);
+  if (last !== p.length) throw new Error(`Bad data path "${path3}"`);
   return toks;
 }
-function jsonPath(obj, path2) {
-  if (!path2 || path2 === "$") return obj;
+function jsonPath(obj, path3) {
+  if (!path3 || path3 === "$") return obj;
   let cur = [obj], spread = false;
-  for (const t of pathTokens(path2)) {
+  for (const t of pathTokens(path3)) {
     const nxt = [];
     for (const c of cur) {
       if (c == null) continue;
@@ -9943,10 +9944,10 @@ function jsonPath(obj, path2) {
   }
   return spread ? cur : cur[0];
 }
-function jsonPathRows(obj, path2) {
-  if (!path2 || path2 === "$") return { rows: obj, parents: null };
+function jsonPathRows(obj, path3) {
+  if (!path3 || path3 === "$") return { rows: obj, parents: null };
   let cur = [obj], hold = [null], par = [null], spread = false;
-  for (const t of pathTokens(path2)) {
+  for (const t of pathTokens(path3)) {
     const nv = [], nh = [], np = [];
     for (let i = 0; i < cur.length; i++) {
       const c = cur[i];
@@ -10424,8 +10425,8 @@ function buildDataSets(def, sources, baseCtx) {
         const declared = (ds.fields || []).filter((fd) => !fd.expr && !fd.path);
         const hasFields = Object.values(asObject).some((v) => v != null && typeof v !== "object");
         if (inner2.length && !hasFields && !declared.some((fd) => Object.hasOwn(asObject, fd.name))) {
-          const at2 = ds.path && ds.path !== "$" ? ds.path : `$.${ds.source}`;
-          baseCtx.warn?.(`Data set "${ds.name}": ${at2} is an object, not a list of rows, so it is one row; expected an array of rows (did you mean ${at2}.${inner2[0]}?)`);
+          const at3 = ds.path && ds.path !== "$" ? ds.path : `$.${ds.source}`;
+          baseCtx.warn?.(`Data set "${ds.name}": ${at3} is an object, not a list of rows, so it is one row; expected an array of rows (did you mean ${at3}.${inner2[0]}?)`);
         }
       }
       const keys = /* @__PURE__ */ new Set();
@@ -11315,6 +11316,8 @@ function newContext() {
     /** @type {Set<string>} part libraries referenced (report ids) */
     libraries: /* @__PURE__ */ new Set(),
     cells: 0,
+    /** @type {any[]} every item tracked, with what happened to it (see items() in importRdlx's result) */
+    items: [],
     warn(msg) {
       if (!cx.warnings.includes(msg)) cx.warnings.push(msg);
     }
@@ -11324,24 +11327,35 @@ function newContext() {
 function track(cx, ar, label) {
   cx.stats.items++;
   const name = String(ar?.Name || label || ar?.Type || "item");
+  const say = (kind, msg) => {
+    if (!t.notes.some((n5) => n5.message === msg)) t.notes.push({ kind, message: msg });
+    cx.warn(`${name}: ${msg}`);
+  };
   const t = {
     name,
     state: "mapped",
+    pos: typeof ar?.__pos === "number" ? ar.__pos : void 0,
+    /** @type {{ kind: string, message: string }[]} */
+    notes: [],
+    /** @type {string[]} expressions that could not be translated */
+    exprs: [],
     /** in the report, with something lost or changed */
     approx(msg) {
       if (t.state === "mapped") t.state = "approximated";
-      cx.warn(`${name}: ${msg}`);
+      say("approximated", msg);
     },
     /** for information only */
     note(msg) {
-      cx.warn(`${name}: ${msg}`);
+      say("info", msg);
     },
     /** not in the report */
     drop(msg) {
       t.state = "dropped";
-      cx.warn(`${name}: ${msg}`);
+      say("dropped", msg);
     }
   };
+  cx.items.push(t);
+  for (const x of Array.isArray(ar?.__exprs) ? ar.__exprs : []) if (typeof x === "string" && !t.exprs.includes(x)) t.exprs.push(x);
   for (const n5 of Array.isArray(ar?.__notes) ? ar.__notes : []) t.approx(n5);
   for (const n5 of Array.isArray(ar?.__info) ? ar.__info : []) t.note(n5);
   return t;
@@ -11359,6 +11373,7 @@ function uniq(cx, base, generated = false) {
 }
 function ex(cx, t, v, ctx, opt = {}) {
   const r = translateExpression(v, { text: opt.text, fields: opt.fields, lit: opt.lit, region: ctx.region, scopes: cx.scopes, runScopes: cx.runScopes });
+  if (!r.ok && typeof v === "string" && !t.exprs.includes(v)) t.exprs.push(v);
   if (!r.ok) t.approx(`${r.notes.join("; ")}; ${opt.text ? "the expression is shown as text" : `${opt.what || "that setting"} is left out`}.`);
   else for (const n5 of r.notes) t.approx(`${n5}.`);
   return r.value;
@@ -11560,12 +11575,13 @@ function convertItem(ar, cx, ctx) {
     dropInside(ar, cx);
     return finish(cx, t, null);
   }
-  const snap = { ...cx.stats };
+  const snap = { ...cx.stats }, tracked = cx.items.length;
   try {
     return conv(ar, cx, ctx);
   } catch (e2) {
     if (e2 instanceof ImportBudgetError) throw e2;
     Object.assign(cx.stats, snap);
+    cx.items.length = tracked;
     const t = track(cx, ar);
     t.drop(`it could not be converted (${e2 instanceof Error ? e2.message : e2}), so it was left out.`);
     dropInside(ar, cx);
@@ -11574,25 +11590,25 @@ function convertItem(ar, cx, ctx) {
 }
 function dropInside(ar, cx) {
   let n5 = 0;
-  const walk = (o) => {
+  const walk2 = (o) => {
     if (!o || typeof o !== "object") return;
     if (Array.isArray(o)) {
-      o.forEach(walk);
+      o.forEach(walk2);
       return;
     }
     for (const [k, v] of Object.entries(o)) {
       if (k === "ReportItems" && Array.isArray(v)) {
         for (const x of v) if (x && typeof x === "object" && x.Type) {
           n5++;
-          walk(x);
+          walk2(x);
         }
       } else if (k === "Item" && v && typeof v === "object" && v.Type) {
         n5++;
-        walk(v);
-      } else if (v && typeof v === "object") walk(v);
+        walk2(v);
+      } else if (v && typeof v === "object") walk2(v);
     }
   };
-  walk(ar);
+  walk2(ar);
   cx.stats.items += n5;
   cx.stats.dropped += n5;
 }
@@ -12184,14 +12200,14 @@ function tablix(ar, cx, ctx) {
 function tablixItems(ar) {
   const out = [];
   for (const row of ar.Corner || []) for (const c of row || []) if (c?.Item) out.push(c.Item);
-  const walk = (ms) => {
+  const walk2 = (ms) => {
     for (const m of ms || []) {
       if (m?.Header?.Item) out.push(m.Header.Item);
-      walk(m?.Children);
+      walk2(m?.Children);
     }
   };
-  walk(ar.ColumnHierarchy?.Members);
-  walk(ar.RowHierarchy?.Members);
+  walk2(ar.ColumnHierarchy?.Members);
+  walk2(ar.RowHierarchy?.Members);
   for (const r of ar.Body?.Rows || []) for (const c of r?.Cells || []) if (c?.Item) out.push(c.Item);
   return out;
 }
@@ -12232,13 +12248,13 @@ function tablixTable(ar, cx, ctx) {
   }
   const groups = [], leaves = [];
   let detailVis, problem = null;
-  const walkRows = (ms, level, path2, depth, hint) => {
+  const walkRows = (ms, level, path3, depth, hint) => {
     const localDyn = ms.some((m) => m.Group);
     if (ms.filter((m) => m.Group).length > 1) problem = "two row groups sit side by side";
     let seen = false;
     for (const m of ms) {
       const span = m.Header ? Number(m.Header.LevelCount) || 1 : 0;
-      const p = [...path2, { m, level, span }];
+      const p = [...path3, { m, level, span }];
       const kids = members({ Members: m.Children });
       if (isDyn(m)) {
         if (depth !== groups.length) problem = "its row groups are not nested in one chain";
@@ -12365,15 +12381,15 @@ function tablixMatrix(ar, cx, ctx) {
   const leafIndex = (ms) => {
     const map = /* @__PURE__ */ new Map();
     let n5 = 0;
-    const walk = (list2) => {
+    const walk2 = (list2) => {
       for (const m of list2) {
         map.set(m, m.BodyIndex ?? n5);
         const kids = members({ Members: m.Children });
-        if (kids.length) walk(kids);
+        if (kids.length) walk2(kids);
         else n5++;
       }
     };
-    walk(ms);
+    walk2(ms);
     return map;
   };
   const rIdx = leafIndex(rowMs), cIdx = leafIndex(colMs);
@@ -12506,9 +12522,9 @@ function tablixMatrix(ar, cx, ctx) {
   if (rhs && Object.keys(textStyle(rhs, cx, t, rctx)).length) it.style = { padding: textStyle(rhs, cx, t, rctx).padding ?? 0 };
   if (isFalse(ar.RepeatColumnHeaders)) it.repeatHeader = false;
   regionData(ar, it, cx, t, rctx, ctx);
-  for (const inside of tablixItems(ar)) {
-    const ti = track(cx, inside);
-    if (!used.has(inside) && inside.Value != null && String(inside.Value).trim() !== "") ti.approx("this cell is not shown: a ReportWright matrix shows group headers, values and totals.");
+  for (const inside2 of tablixItems(ar)) {
+    const ti = track(cx, inside2);
+    if (!used.has(inside2) && inside2.Value != null && String(inside2.Value).trim() !== "") ti.approx("this cell is not shown: a ReportWright matrix shows group headers, values and totals.");
     finish(cx, ti, null);
   }
   return finish(cx, t, it);
@@ -13375,11 +13391,11 @@ function fixedPage(fp, cx, info) {
 }
 function collectScopes(ar, cx) {
   const seen = /* @__PURE__ */ new Set();
-  const walk = (o) => {
+  const walk2 = (o) => {
     if (!o || typeof o !== "object" || seen.has(o)) return;
     seen.add(o);
     if (Array.isArray(o)) {
-      o.forEach(walk);
+      o.forEach(walk2);
       return;
     }
     const type = String(o.Type || "").toLowerCase();
@@ -13412,9 +13428,9 @@ function collectScopes(ar, cx) {
     if (type.includes("chart")) {
       for (const p of o.Plots || []) for (const g of [...p?.CategoryGroupings || [], ...p?.SeriesGroupings || []]) if (g?.Grouping?.Name) cx.scopes.set(g.Grouping.Name, null);
     }
-    for (const v of Object.values(o)) if (v && typeof v === "object") walk(v);
+    for (const v of Object.values(o)) if (v && typeof v === "object") walk2(v);
   };
-  walk(ar);
+  walk2(ar);
   for (const d of Array.isArray(ar.DataSets) ? ar.DataSets : []) if (d?.Name) cx.scopes.set(d.Name, d.Name);
 }
 function convertReport(ar, cx, opts) {
@@ -13477,7 +13493,7 @@ function convertReport(ar, cx, opts) {
   if (cx.columns) body.columns = cx.columns;
   if (more.length) body.name = sec0?.Name || "Section1";
   return {
-    $schema: "pagewright/report@1",
+    $schema: "reportwright/report@1",
     name,
     locale: lang,
     ...currencyOf(lang) ? { currency: currencyOf(lang) } : {},
@@ -13518,15 +13534,15 @@ function importRdlx(input, opts = {}) {
   } catch (e2) {
     if (e2 instanceof ImportBudgetError) {
       const error = `The report is too large to import: ${e2.message}`;
-      return { definition: convertReport({}, newContext(), opts), warnings: [`${error}.`], stats: { items: 0, mapped: 0, approximated: 0, dropped: 0 }, error };
+      return { definition: convertReport({}, newContext(), opts), warnings: [`${error}.`], stats: { items: 0, mapped: 0, approximated: 0, dropped: 0 }, items: [], error };
     }
     cx.warn(`The import stopped early (${e2 instanceof Error ? e2.message : e2}), so parts of the report are missing.`);
     definition = convertReport({}, newContext(), opts);
   }
-  return { definition, warnings: cx.warnings, stats: cx.stats };
+  return { definition, warnings: cx.warnings, stats: cx.stats, items: importedItems(cx.items) };
 }
 var UNIT2, r25, NAMED3, MONO2, weightOf, ALIGN, VALIGN, LITS, safeName, Untranslatable, no, bad, CONT, NUM, NAME2, at, MAX_RESULT, VB_OPS, BIN2, q2, wrap, atom, fn, ROOT, cap, GLOBALS, INTERVAL, DATEFORMAT, AGG2, SAME, CONVERT, MATH, VB_DAYS, escText, isExpr, inner, AGG_RE, ImportBudgetError, OUTPUT_LIMITS, hasDeco, CONVERTERS, TARGETS, bare, isTrue, isFalse, stripHtml, SYMBOLOGY, missing, FILTER_OPS,
-joinKeys, CELL_ITEMS, TEXT_CELL, isDyn, anyDyn, members, shiftY, CHART_TYPES2, PALETTES2, SERIES_KIND, SQL_PROVIDERS, CONN_KEYS, getKey, unescapeTpl, TYPE_HINT, PTYPE, coerceLit, PAGE_NO;
+joinKeys, CELL_ITEMS, TEXT_CELL, isDyn, anyDyn, members, shiftY, CHART_TYPES2, PALETTES2, SERIES_KIND, SQL_PROVIDERS, CONN_KEYS, getKey, unescapeTpl, TYPE_HINT, PTYPE, coerceLit, PAGE_NO, importedItems, rewordItems;
 var init_rdlx = __esm({
   "src/importers/rdlx.js"() {
     init_units();
@@ -13536,13 +13552,13 @@ var init_rdlx = __esm({
     init_data();
     UNIT2 = { in: 72, cm: 72 / 2.54, mm: 72 / 25.4, pt: 1, pc: 12, px: 0.75 };
     r25 = (n5) => Math.round(n5 * 100) / 100;
-    NAMED3 = Object.fromEntries("aliceblue:f0f8ff,antiquewhite:faebd7,aqua:00ffff,aquamarine:7fffd4,azure:f0ffff,beige:f5f5dc,bisque:ffe4c4,black:000000,blanchedalmond:ffebcd,blue:0000ff,blueviolet:8a2be2,brown:a52a2a,burlywood:deb887,cadetblue:5f9ea0,chartreuse:7fff00,chocolate:d2691e,coral:ff7f50,cornflowerblue:6495ed,cornsilk:fff8dc,crimson:dc143c,cyan:00ffff,darkblue:00008b,darkcyan:008b8b,dar\
-kgoldenrod:b8860b,darkgray:a9a9a9,darkgreen:006400,darkgrey:a9a9a9,darkkhaki:bdb76b,darkmagenta:8b008b,darkolivegreen:556b2f,darkorange:ff8c00,darkorchid:9932cc,darkred:8b0000,darksalmon:e9967a,darkseagreen:8fbc8f,darkslateblue:483d8b,darkslategray:2f4f4f,darkslategrey:2f4f4f,darkturquoise:00ced1,darkviolet:9400d3,deeppink:ff1493,deepskyblue:00bfff,dimgray:696969,dimgrey:696969,dodgerblue:1e90ff,f\
-irebrick:b22222,floralwhite:fffaf0,forestgreen:228b22,fuchsia:ff00ff,gainsboro:dcdcdc,ghostwhite:f8f8ff,gold:ffd700,goldenrod:daa520,gray:808080,green:008000,greenyellow:adff2f,grey:808080,honeydew:f0fff0,hotpink:ff69b4,indianred:cd5c5c,indigo:4b0082,ivory:fffff0,khaki:f0e68c,lavender:e6e6fa,lavenderblush:fff0f5,lawngreen:7cfc00,lemonchiffon:fffacd,lightblue:add8e6,lightcoral:f08080,lightcyan:e0ff\
-ff,lightgoldenrodyellow:fafad2,lightgray:d3d3d3,lightgreen:90ee90,lightgrey:d3d3d3,lightpink:ffb6c1,lightsalmon:ffa07a,lightseagreen:20b2aa,lightskyblue:87cefa,lightslategray:778899,lightslategrey:778899,lightsteelblue:b0c4de,lightyellow:ffffe0,lime:00ff00,limegreen:32cd32,linen:faf0e6,magenta:ff00ff,maroon:800000,mediumaquamarine:66cdaa,mediumblue:0000cd,mediumorchid:ba55d3,mediumpurple:9370db,me\
-diumseagreen:3cb371,mediumslateblue:7b68ee,mediumspringgreen:00fa9a,mediumturquoise:48d1cc,mediumvioletred:c71585,midnightblue:191970,mintcream:f5fffa,mistyrose:ffe4e1,moccasin:ffe4b5,navajowhite:ffdead,navy:000080,oldlace:fdf5e6,olive:808000,olivedrab:6b8e23,orange:ffa500,orangered:ff4500,orchid:da70d6,palegoldenrod:eee8aa,palegreen:98fb98,paleturquoise:afeeee,palevioletred:db7093,papayawhip:ffef\
-d5,peachpuff:ffdab9,peru:cd853f,pink:ffc0cb,plum:dda0dd,powderblue:b0e0e6,purple:800080,rebeccapurple:663399,red:ff0000,rosybrown:bc8f8f,royalblue:4169e1,saddlebrown:8b4513,salmon:fa8072,sandybrown:f4a460,seagreen:2e8b57,seashell:fff5ee,sienna:a0522d,silver:c0c0c0,skyblue:87ceeb,slateblue:6a5acd,slategray:708090,slategrey:708090,snow:fffafa,springgreen:00ff7f,steelblue:4682b4,tan:d2b48c,teal:00808\
-0,thistle:d8bfd8,tomato:ff6347,turquoise:40e0d0,violet:ee82ee,wheat:f5deb3,white:ffffff,whitesmoke:f5f5f5,yellow:ffff00,yellowgreen:9acd32".split(",").map((p) => p.split(":")));
+    NAMED3 = Object.fromEntries(("aliceblue:f0f8ff,antiquewhite:faebd7,aqua:00ffff,aquamarine:7fffd4,azure:f0ffff,beige:f5f5dc,bisque:ffe4c4,black:000000,blanchedalmond:ffebcd,blue:0000ff,blueviolet:8a2be2,brown:a52a2a,burlywood:deb887,cadetblue:5f9ea0,chartreuse:7fff00,chocolate:d2691e,coral:ff7f50,cornflowerblue:6495ed,cornsilk:fff8dc,crimson:dc143c,cyan:00ffff,darkblue:00008b,darkcyan:008b8b,dar"+
+"kgoldenrod:b8860b,darkgray:a9a9a9,darkgreen:006400,darkgrey:a9a9a9,darkkhaki:bdb76b,darkmagenta:8b008b,darkolivegreen:556b2f,darkorange:ff8c00,darkorchid:9932cc,darkred:8b0000,darksalmon:e9967a,darkseagreen:8fbc8f,darkslateblue:483d8b,darkslategray:2f4f4f,darkslategrey:2f4f4f,darkturquoise:00ced1,darkviolet:9400d3,deeppink:ff1493,deepskyblue:00bfff,dimgray:696969,dimgrey:696969,dodgerblue:1e90ff,f"+
+"irebrick:b22222,floralwhite:fffaf0,forestgreen:228b22,fuchsia:ff00ff,gainsboro:dcdcdc,ghostwhite:f8f8ff,gold:ffd700,goldenrod:daa520,gray:808080,green:008000,greenyellow:adff2f,grey:808080,honeydew:f0fff0,hotpink:ff69b4,indianred:cd5c5c,indigo:4b0082,ivory:fffff0,khaki:f0e68c,lavender:e6e6fa,lavenderblush:fff0f5,lawngreen:7cfc00,lemonchiffon:fffacd,lightblue:add8e6,lightcoral:f08080,lightcyan:e0ff"+
+"ff,lightgoldenrodyellow:fafad2,lightgray:d3d3d3,lightgreen:90ee90,lightgrey:d3d3d3,lightpink:ffb6c1,lightsalmon:ffa07a,lightseagreen:20b2aa,lightskyblue:87cefa,lightslategray:778899,lightslategrey:778899,lightsteelblue:b0c4de,lightyellow:ffffe0,lime:00ff00,limegreen:32cd32,linen:faf0e6,magenta:ff00ff,maroon:800000,mediumaquamarine:66cdaa,mediumblue:0000cd,mediumorchid:ba55d3,mediumpurple:9370db,me"+
+"diumseagreen:3cb371,mediumslateblue:7b68ee,mediumspringgreen:00fa9a,mediumturquoise:48d1cc,mediumvioletred:c71585,midnightblue:191970,mintcream:f5fffa,mistyrose:ffe4e1,moccasin:ffe4b5,navajowhite:ffdead,navy:000080,oldlace:fdf5e6,olive:808000,olivedrab:6b8e23,orange:ffa500,orangered:ff4500,orchid:da70d6,palegoldenrod:eee8aa,palegreen:98fb98,paleturquoise:afeeee,palevioletred:db7093,papayawhip:ffef"+
+"d5,peachpuff:ffdab9,peru:cd853f,pink:ffc0cb,plum:dda0dd,powderblue:b0e0e6,purple:800080,rebeccapurple:663399,red:ff0000,rosybrown:bc8f8f,royalblue:4169e1,saddlebrown:8b4513,salmon:fa8072,sandybrown:f4a460,seagreen:2e8b57,seashell:fff5ee,sienna:a0522d,silver:c0c0c0,skyblue:87ceeb,slateblue:6a5acd,slategray:708090,slategrey:708090,snow:fffafa,springgreen:00ff7f,steelblue:4682b4,tan:d2b48c,teal:00808"+
+"0,thistle:d8bfd8,tomato:ff6347,turquoise:40e0d0,violet:ee82ee,wheat:f5deb3,white:ffffff,whitesmoke:f5f5f5,yellow:ffff00,yellowgreen:9acd32").split(",").map((p) => p.split(":")));
     MONO2 = /mono|courier|consol|menlo|monaco|lucida console|typewriter/i;
     weightOf = (w) => {
       const s = String(w).trim().toLowerCase();
@@ -13914,6 +13930,8 @@ d5,peachpuff:ffdab9,peru:cd853f,pink:ffc0cb,plum:dda0dd,powderblue:b0e0e6,purple
       return v;
     };
     PAGE_NO = /Globals!\s*(PageNumber|TotalPages|PageNumberInSection|TotalPagesInSection|OverallPageNumber|OverallTotalPages)\b/i;
+    importedItems = (items) => items.filter((t) => t.state !== "mapped" || t.notes.length || t.exprs.length).map((t) => ({ name: t.name, state: t.state, ...t.pos != null ? { pos: t.pos } : {}, notes: t.notes, exprs: t.exprs }));
+    rewordItems = (items, f4) => (items || []).map((i) => ({ ...i, notes: i.notes.map((n5) => ({ ...n5, message: f4(n5.message) })) }));
   }
 });
 
@@ -13935,7 +13953,7 @@ function importRdl(input, opts = {}) {
   const notes = [];
   let ar;
   try {
-    ar = toRdlx(root, notes, m ? Number(m[1]) : 2016);
+    ar = toRdlx(root, notes, m ? Number(m[1]) : 2016, opts.resolve);
   } catch (e2) {
     if (e2 instanceof ImportBudgetError) {
       const error = `The report is too large to import: ${e2.message}`;
@@ -13949,10 +13967,12 @@ function importRdl(input, opts = {}) {
   const def = r.definition;
   for (const p of def.parameters || []) if (ar.__hidden?.has(p.name)) p.hidden = true;
   if (ar.__code) def.customCode = ar.__code;
-  const warnings = [...notes, ...r.warnings.filter((w) => !/is hidden in ActiveReports; ReportWright shows it/.test(w))].map((w) => w.replace(/ActiveReports/g, "SSRS"));
-  return { definition: def, warnings: [...new Set(warnings)], stats: r.stats };
+  const hiddenNote = /is hidden in ActiveReports; ReportWright shows it/;
+  const warnings = [...notes, ...r.warnings.filter((w) => !hiddenNote.test(w))].map((w) => w.replace(/ActiveReports/g, "SSRS"));
+  const items = rewordItems(r.items.map((i) => ({ ...i, notes: i.notes.filter((n5) => !hiddenNote.test(n5.message)) })), (w) => w.replace(/ActiveReports/g, "SSRS"));
+  return { definition: def, warnings: [...new Set(warnings)], stats: r.stats, items };
 }
-function toRdlx(root, notes, year) {
+function toRdlx(root, notes, year, resolve) {
   const NS3 = root.ns;
   const kids = (e2, name) => e2 ? e2.children.filter((c) => c.ns === NS3 && (name == null || c.name === name)) : [];
   const kid = (e2, name) => e2?.children.find((c) => c.ns === NS3 && c.name === name);
@@ -13961,7 +13981,7 @@ function toRdlx(root, notes, year) {
     return c ? c.attrs.nil === "true" ? null : c.text : void 0;
   };
   const val = (e2, name) => fix(raw(e2, name));
-  const path2 = (e2, ...names) => names.reduce((x, n5) => kid(x, n5), e2);
+  const path3 = (e2, ...names) => names.reduce((x, n5) => kid(x, n5), e2);
   const list2 = (e2, outer, inner2) => kids(kid(e2, outer), inner2);
   const variables = /* @__PURE__ */ new Map();
   const boxes = /* @__PURE__ */ new Map();
@@ -14119,6 +14139,7 @@ function toRdlx(root, notes, year) {
       Name: e2.attrs.Name,
       __notes: itemNotes,
       __info: itemInfo,
+      __pos: e2.pos,
       Left: raw(e2, "Left"),
       Top: raw(e2, "Top"),
       Width: raw(e2, "Width"),
@@ -14544,7 +14565,7 @@ function toRdlx(root, notes, year) {
         const vals = kid(dp, "ChartDataPointValues");
         const srcs = pt.values.map((n5) => val(vals, n5)).filter((v) => v != null && v !== "");
         if (!srcs.length) return;
-        const caption = val(path2(s, "ChartItemInLegend"), "LegendText") || statics[i] && val(statics[i], "Label") || s.attrs.Name;
+        const caption = val(path3(s, "ChartItemInLegend"), "LegendText") || statics[i] && val(statics[i], "Label") || s.attrs.Name;
         p.Encodings.Values.push({ Field: { Value: srcs }, Caption: isExpr2(caption) ? s.attrs.Name : caption });
         const x = val(vals, "X");
         if (x && !p.x) p.x = x;
@@ -14654,23 +14675,52 @@ function toRdlx(root, notes, year) {
     const r = e2.name === "Tablix" || e2.name === "Chart" ? e2.attrs.Name || reg : reg;
     for (const c of e2.children) prepass(c, r);
   })(root, null);
+  function sharedSource(ref2) {
+    let text2;
+    try {
+      text2 = resolve?.("datasource", ref2);
+    } catch {
+      text2 = null;
+    }
+    if (typeof text2 !== "string") return null;
+    let doc;
+    try {
+      doc = parseXml(text2);
+    } catch (e2) {
+      notes.push(`The shared data source "${ref2}" could not be read (${e2 instanceof Error ? e2.message : e2}); it is treated as SQL Server.`);
+      return null;
+    }
+    const sub = (e2, n5) => e2?.children.find((c) => c.name === n5);
+    const props = doc.name === "RptDataSource" ? sub(doc, "ConnectionProperties") : doc.name === "DataSourceDefinition" ? doc : null;
+    if (!props) {
+      notes.push(`The shared data source "${ref2}" is not an SSRS data source (its root is <${doc.name}>); it is treated as SQL Server.`);
+      return null;
+    }
+    return { provider: (sub(props, "Extension")?.text || "SQL").trim(), connect: (sub(props, "ConnectString")?.text ?? "").trim() };
+  }
   const TYPE_OF = (t) => /datetime|date$/i.test(t) ? "date" : /int|decimal|double|single|byte|float/i.test(t) ? "number" : /boolean/i.test(t) ? "boolean" : null;
   const DataSources = list2(root, "DataSources", "DataSource").map((d) => {
     const name = d.attrs.Name;
     const cp = kid(d, "ConnectionProperties");
     let provider = raw(cp, "DataProvider") || "";
+    let connect = raw(cp, "ConnectString") ?? "";
     if (!cp && kid(d, "DataSourceReference")) {
-      provider = "SQL";
-      notes.push(`Data source "${name}" is the shared data source "${raw(d, "DataSourceReference")}", whose connection is not in the file; it is treated as SQL Server.`);
+      const ref2 = raw(d, "DataSourceReference") ?? "";
+      const shared = sharedSource(ref2);
+      if (shared) ({ provider, connect } = shared);
+      else {
+        provider = "SQL";
+        notes.push(`Data source "${name}" is the shared data source "${ref2}", whose connection is not in the file; it is treated as SQL Server.`);
+      }
     }
     if (/^(OLEDB-MD|ESSBASE|SAPBW|SQLAS|HYPERION)/i.test(provider)) provider = `${provider} (MDX)`;
-    return { Name: name, ConnectionProperties: { DataProvider: provider, ConnectString: raw(cp, "ConnectString") ?? "" } };
+    return { Name: name, ConnectionProperties: { DataProvider: provider, ConnectString: connect } };
   });
   const entered = /* @__PURE__ */ new Map();
   const providers = new Map(DataSources.map((d) => [d.Name, String(d.ConnectionProperties.DataProvider).toUpperCase()]));
   const DataSets = list2(root, "DataSets", "DataSet").map((d) => {
     const q3 = kid(d, "Query");
-    const shared = path2(d, "SharedDataSet", "SharedDataSetReference");
+    const shared = path3(d, "SharedDataSet", "SharedDataSetReference");
     if (shared) notes.push(`Data set "${d.attrs.Name}" is the shared data set "${shared.text}", which is not in the file; set its source and query.`);
     const types = /* @__PURE__ */ new Map();
     const Fields = list2(d, "Fields", "Field").map((f4) => {
@@ -15296,9 +15346,9 @@ function dotted(n5) {
   return null;
 }
 function emMember2(n5, env, d) {
-  const path2 = dotted(n5);
-  if (path2) {
-    const short = path2.replace(/^java\.(lang|math|util)\./, "");
+  const path3 = dotted(n5);
+  if (path3) {
+    const short = path3.replace(/^java\.(lang|math|util)\./, "");
     if (short === "Boolean.TRUE") return A("True", "bool");
     if (short === "Boolean.FALSE") return A("False", "bool");
     if (short === "Math.PI") return A("Math.PI", "num");
@@ -15308,7 +15358,7 @@ function emMember2(n5, env, d) {
     if (/^(RoundingMode|BigDecimal)\.[A-Z_]+$/.test(short)) return A(vbStr(short.split(".")[1]), "str");
   }
   if (n5.name === "length" && n5.obj) throw new Untranslatable2("an array length");
-  throw new Untranslatable2(`the field ${path2 || `.${n5.name}`}`);
+  throw new Untranslatable2(`the field ${path3 || `.${n5.name}`}`);
 }
 function emNew(n5, env, d) {
   const name = n5.name.replace(/^java\.(lang|math|util|sql)\./, "");
@@ -15338,9 +15388,9 @@ function emCall2(n5, env, d) {
     }
     throw new Untranslatable2(`the function ${n5.name}()`);
   }
-  const path2 = dotted(n5.obj);
-  if (path2 && !(n5.obj.k === "id" && /^[a-z]/.test(n5.obj.name) && !/^java$/.test(n5.obj.name))) {
-    const cls = path2.replace(/^java\.(lang|math|util|sql)\./, "");
+  const path3 = dotted(n5.obj);
+  if (path3 && !(n5.obj.k === "id" && /^[a-z]/.test(n5.obj.name) && !/^java$/.test(n5.obj.name))) {
+    const cls = path3.replace(/^java\.(lang|math|util|sql)\./, "");
     const a2 = args();
     const m = n5.name;
     if (cls === "String" && m === "valueOf" && a2.length === 1) return jstr(a2[0]);
@@ -15521,7 +15571,7 @@ function importJrxml(input, opts = {}) {
   const charts = /* @__PURE__ */ new Map();
   let ar;
   try {
-    ar = toRdlx2(root, notes, charts, opts.name || root.attrs.name);
+    ar = toRdlx2(root, notes, charts, opts.name || root.attrs.name, opts.resolve);
   } catch (e2) {
     if (e2 instanceof ImportBudgetError) {
       const error = `The report is too large to import: ${e2.message}`;
@@ -15547,7 +15597,7 @@ function importJrxml(input, opts = {}) {
   r.definition.arithmetic = "double";
   placeCharts(r.definition, charts);
   const warnings = [...notes, ...r.warnings].map((w) => w.replace(/ActiveReports/g, "JasperReports"));
-  return { definition: r.definition, warnings: [...new Set(warnings)], stats: r.stats };
+  return { definition: r.definition, warnings: [...new Set(warnings)], stats: r.stats, items: rewordItems(r.items, (w) => w.replace(/ActiveReports/g, "JasperReports")) };
 }
 function stripJasperDoctype(s) {
   const i = s.indexOf("<!DOCTYPE");
@@ -15556,9 +15606,9 @@ function stripJasperDoctype(s) {
   if (e2 < 0) return s;
   const decl = s.slice(i, e2 + 1);
   if (decl.includes("[") || !/^<!DOCTYPE\s+jasperReport\s/.test(decl)) return s;
-  return s.slice(0, i) + s.slice(e2 + 1);
+  return s.slice(0, i) + decl.replace(/[^\n]/g, " ") + s.slice(e2 + 1);
 }
-function toRdlx2(root, notes, charts, reportName) {
+function toRdlx2(root, notes, charts, reportName, resolve) {
   const kid = (e2, n5) => e2?.children.find((c) => c.name === n5);
   const kids = (e2, n5) => e2 ? e2.children.filter((c) => n5 == null || c.name === n5) : [];
   const txt = (e2, n5) => {
@@ -15651,8 +15701,8 @@ function toRdlx2(root, notes, charts, reportName) {
   };
   const BAND_AT = { detail: "detail", gh: "header", gf: "footer", title: "start", summary: "end" };
   function jasper(calc, inner2, reset, c) {
-    const at2 = BAND_AT[c.band];
-    const keys = at2 && reset != null ? groupKeys() : null;
+    const at3 = BAND_AT[c.band];
+    const keys = at3 && reset != null ? groupKeys() : null;
     if (!keys) return null;
     let end = -1;
     if (c.evalTime === "Report") end = 0;
@@ -15660,7 +15710,7 @@ function toRdlx2(root, notes, charts, reportName) {
       const k = groups.findIndex((g) => g.attrs.name === c.evalGroup);
       end = k >= 0 ? k + 1 : -1;
     } else if (c.evalTime === "Auto") end = reset;
-    return `JasperValue("${MAIN}", "${calc}", ${inner2}, "${at2}", ${reset}, ${end}${keys.map((k) => `, ${k}`).join("")})`;
+    return `JasperValue("${MAIN}", "${calc}", ${inner2}, "${at3}", ${reset}, ${end}${keys.map((k) => `, ${k}`).join("")})`;
   }
   const depthOf = (gname) => {
     const k = groups.findIndex((g) => g.attrs.name === gname);
@@ -15742,6 +15792,7 @@ function toRdlx2(root, notes, charts, reportName) {
       return "=" + v.s;
     } catch (e2) {
       if (!(e2 instanceof Untranslatable2)) throw e2;
+      (item2.__exprs ||= []).push(s);
       (item2.__notes ||= []).push(`${e2.message} has no ReportWright equivalent, so the expression ${s.length > 200 ? s.slice(0, 200) + "…" : s} is shown as text.`);
       return s.startsWith("=") ? `="${s.replace(/"/g, '""')}"` : s;
     }
@@ -15751,12 +15802,50 @@ function toRdlx2(root, notes, charts, reportName) {
       return "=" + vb2(String(src).trim(), c);
     } catch (e2) {
       if (!(e2 instanceof Untranslatable2)) throw e2;
+      (item2.__exprs ||= []).push(String(src).trim());
       (item2.__notes ||= []).push(`${what} uses ${e2.message}, which has no ReportWright equivalent, so it is left out.`);
       return void 0;
     }
   }
   const styles = new Map(kids(root, "style").map((s) => [s.attrs.name, s]));
-  const defStyle = kids(root, "style").find((s) => s.attrs.isDefault === "true" || s.attrs.default === "true");
+  const seenTemplates = /* @__PURE__ */ new Set();
+  (function templates(el, depth) {
+    for (const t of kids(el, "template")) {
+      const src = (kid(t, "expression")?.text ?? t.text).trim();
+      const lit2 = /^"([^"]+)"$/.exec(src);
+      const ref2 = lit2 ? lit2[1] : depth > 0 && !/["$(){}+]/.test(src) ? src : null;
+      if (!ref2) {
+        if (src) note(`A style template is chosen by an expression (${src.slice(0, 120)}), so its styles are missing.`);
+        continue;
+      }
+      if (seenTemplates.has(ref2) || seenTemplates.size >= 32) continue;
+      seenTemplates.add(ref2);
+      let text2;
+      try {
+        text2 = resolve?.("template", ref2);
+      } catch {
+        text2 = null;
+      }
+      if (typeof text2 !== "string") {
+        note(`The style template "${ref2}" is not in the file, so items that use its styles have the default style.`);
+        continue;
+      }
+      let doc;
+      try {
+        doc = parseXml(text2);
+      } catch (e2) {
+        note(`The style template "${ref2}" could not be read (${e2 instanceof Error ? e2.message : e2}), so its styles are missing.`);
+        continue;
+      }
+      if (doc.name !== "jasperTemplate") {
+        note(`The style template "${ref2}" is not a JasperReports template (its root is <${doc.name}>), so its styles are missing.`);
+        continue;
+      }
+      for (const s of kids(doc, "style")) if (s.attrs.name && !styles.has(s.attrs.name)) styles.set(s.attrs.name, s);
+      if (depth < 8) templates(doc, depth + 1);
+    }
+  })(root, 0);
+  const defStyle = [...styles.values()].find((s) => s.attrs.isDefault === "true" || s.attrs.default === "true");
   function styleAttrs(name, seen = 0) {
     const s = styles.get(name);
     if (!s || seen > 10) return {};
@@ -15910,7 +15999,7 @@ function toRdlx2(root, notes, charts, reportName) {
   }
   function item(n5, c) {
     const a = n5.a, re = n5.re, e2 = n5.el;
-    const base = { Name: nameFor(n5, n5.kind), Left: pt(a.x), Top: pt(a.y), Width: pt(a.width), Height: pt(a.height) };
+    const base = { __pos: e2.pos, Name: nameFor(n5, n5.kind), Left: pt(a.x), Top: pt(a.y), Width: pt(a.width), Height: pt(a.height) };
     const it = { ...base };
     const st = { ...defStyle ? styleAttrs(defStyle.attrs.name) : {}, ...a.style ? styleAttrs(a.style) : {}, ...stripUndef(normAttrs(re.attrs === e2.attrs ? e2.attrs : { ...re.attrs, ...e2.attrs, ...n5.te?.attrs || {}, ...kid(n5.te, "font")?.attrs || {} })), ...boxAttrs(kid(e2, "box")) };
     if (a.style && !styles.has(a.style)) (it.__notes ||= []).push(`its style "${a.style}" is not in the file (a style template?), so it has the default style.`);
@@ -16371,9 +16460,9 @@ function toRdlx2(root, notes, charts, reportName) {
       DataSources.push({ Name: srcName, ConnectionProperties: { DataProvider: "SQL", ConnectString: "" } });
     } else if (xpath) {
       set.Query.CommandText = q3?.text.trim() || "";
-      const at2 = String(root.children.find((c) => c.name === "property" && c.attrs.name === "net.sf.jasperreports.xml.source")?.attrs.value || "").trim();
-      if (!at2) note(`Data set "${name}": JasperReports gets its XML from Java code; set the XML source's URL in ReportWright.`);
-      DataSources.push({ Name: srcName, ConnectionProperties: { DataProvider: "XML", ConnectString: at2 ? `XmlDoc=${at2}` : "" } });
+      const at3 = String(root.children.find((c) => c.name === "property" && c.attrs.name === "net.sf.jasperreports.xml.source")?.attrs.value || "").trim();
+      if (!at3) note(`Data set "${name}": JasperReports gets its XML from Java code; set the XML source's URL in ReportWright.`);
+      DataSources.push({ Name: srcName, ConnectionProperties: { DataProvider: "XML", ConnectString: at3 ? `XmlDoc=${at3}` : "" } });
     } else {
       if (q3 && q3.text.trim()) note(`Data set "${name}": its ${q3.attrs.language || "query"} query is not converted; point the data source at the data (JSON or CSV) and set its path.`);
       else note(`Data set "${name}": JasperReports gets its rows from Java code (a data source); point the ReportWright data source at the data.`);
@@ -16513,19 +16602,19 @@ function importBirt(input, opts = {}) {
   const r = importRdlx(ar, { name });
   if (r.error) return r;
   const warnings = [...notes, ...r.warnings].map((w) => w.replace(/ActiveReports/g, "BIRT"));
-  const walk = (items) => {
+  const walk2 = (items) => {
     for (const i of items || []) {
       if (i.type === "table" && PAGE_BREAKS.get(i.name) > 0) i.pageBreakEvery = PAGE_BREAKS.get(i.name);
-      walk(i.items);
+      walk2(i.items);
     }
   };
-  for (const sec of [r.definition.sections?.body].flat()) walk(sec?.items);
+  for (const sec of [r.definition.sections?.body].flat()) walk2(sec?.items);
   PAGE_BREAKS.clear();
   r.definition.collation = "ordinal";
   r.definition.nullOrder = "low";
   r.definition.arithmetic = "double";
   r.definition.bandRows = "first-last";
-  return { definition: r.definition, warnings: [...new Set(warnings)], stats: r.stats };
+  return { definition: r.definition, warnings: [...new Set(warnings)], stats: r.stats, items: rewordItems(r.items, (w) => w.replace(/ActiveReports/g, "BIRT")) };
 }
 function toRdlx3(root, notes, reportName) {
   const kid = (e2, n5) => e2?.children.find((c) => c.name === n5);
@@ -16739,6 +16828,7 @@ function toRdlx3(root, notes, reportName) {
       return "=" + vb2(s, c);
     } catch (e2) {
       if (!(e2 instanceof Untranslatable2)) throw e2;
+      (item2.__exprs ||= []).push(s);
       (item2.__notes ||= []).push(`${e2.message} has no ReportWright equivalent, so the expression ${s.length > 200 ? s.slice(0, 200) + "…" : s} is shown as text.`);
       return s.startsWith("=") ? `="${s.replace(/"/g, '""')}"` : s;
     }
@@ -16748,6 +16838,7 @@ function toRdlx3(root, notes, reportName) {
       return "=" + vb2(src, c);
     } catch (e2) {
       if (!(e2 instanceof Untranslatable2)) throw e2;
+      (item2.__exprs ||= []).push(String(src));
       (item2.__notes ||= []).push(`${what} uses ${e2.message}, which has no ReportWright equivalent, so it is left out.`);
       return void 0;
     }
@@ -16829,8 +16920,8 @@ function toRdlx3(root, notes, reportName) {
   function rdlxStyle(st, item2, c, opt = {}) {
     const o = {};
     if (st.fontFamily) o.FontFamily = genericFont(st.fontFamily);
-    const fs2 = fontPt(st.fontSize);
-    if (fs2) o.FontSize = pt(fs2);
+    const fs3 = fontPt(st.fontSize);
+    if (fs3) o.FontSize = pt(fs3);
     if (st.fontWeight && /bold|[6-9]00/.test(st.fontWeight)) o.FontWeight = "Bold";
     if (st.fontStyle === "italic" || st.fontStyle === "oblique") o.FontStyle = "Italic";
     if (st.textUnderline === "underline") o.TextDecoration = "Underline";
@@ -16889,18 +16980,18 @@ function toRdlx3(root, notes, reportName) {
   const nameFor = (e2, kind) => e2.attrs.name && NAME_OK.test(e2.attrs.name) ? e2.attrs.name : `${kind}${++seq}`;
   const ITEM_KINDS = /* @__PURE__ */ new Set(["label", "data", "text", "text-data", "auto-text", "image", "grid", "table", "list", "extended-item", "line", "free-form", "template-report-item", "multi-line-data"]);
   const textH = (text2, st) => {
-    const fs2 = fontPt(st.fontSize) || 10;
-    return Math.max(1, String(text2 || "").split("\n").length) * fs2 * 1.25 + 2;
+    const fs3 = fontPt(st.fontSize) || 10;
+    return Math.max(1, String(text2 || "").split("\n").length) * fs3 * 1.25 + 2;
   };
   function htmlParts(html) {
     const parts = [];
     const re = /<value-of[^>]*>([\s\S]*?)<\/value-of>/gi;
-    let at2 = 0, m2;
+    let at3 = 0, m2;
     while (m2 = re.exec(html)) {
-      parts.push({ t: html.slice(at2, m2.index) }, { e: m2[1] });
-      at2 = re.lastIndex;
+      parts.push({ t: html.slice(at3, m2.index) }, { e: m2[1] });
+      at3 = re.lastIndex;
     }
-    parts.push({ t: html.slice(at2) });
+    parts.push({ t: html.slice(at3) });
     const out = parts.map((p) => p.t == null ? p : { t: decodeHtml(p.t, false) });
     if (out[0].t != null) out[0].t = out[0].t.trimStart();
     const last = out[out.length - 1];
@@ -16928,7 +17019,7 @@ function toRdlx3(root, notes, reportName) {
     const w = Math.min(W2, len(prop(e2, "width"), W2, W2)) || W2;
     const given = len(prop(e2, "height"), 0, 0);
     const x = len(prop(e2, "x"), W2, 0);
-    const it = { Name: nameFor(e2, e2.name.replace(/(^|-)(\w)/g, (_, __, ch) => ch.toUpperCase())), Left: pt(x), Width: pt(w) };
+    const it = { __pos: e2.pos, Name: nameFor(e2, e2.name.replace(/(^|-)(\w)/g, (_, __, ch) => ch.toUpperCase())), Left: pt(x), Width: pt(w) };
     const vis = listProp(e2, "visibility")[0];
     if (vis) {
       const ve = prop(vis, "valueExpr");
@@ -16986,6 +17077,7 @@ function toRdlx3(root, notes, reportName) {
               v = "=" + binding(b, c, 0);
             } catch (er) {
               if (!(er instanceof Untranslatable2)) throw er;
+              (it.__exprs ||= []).push(String(prop(b, "expression") ?? col3));
               (it.__notes ||= []).push(`its column "${col3}" uses ${er.message}, so it is shown as text.`);
               v = col3;
             }
@@ -17014,6 +17106,7 @@ function toRdlx3(root, notes, reportName) {
                 pieces.push(`(${vb2(decodeHtml(p.e), c)})`);
               } catch (er) {
                 if (!(er instanceof Untranslatable2)) throw er;
+                (it.__exprs ||= []).push(decodeHtml(p.e));
                 (it.__notes ||= []).push(`a <value-of> uses ${er.message}, so it is left out.`);
               }
             }
@@ -17407,6 +17500,7 @@ var init_birt = __esm({
 // src/importers/index.js
 var importers_exports = {};
 __export(importers_exports, {
+  decodeXml: () => decodeXml,
   importXmlReport: () => importXmlReport,
   rootName: () => rootName
 });
@@ -17426,6 +17520,21 @@ function rootName(s) {
   }
   return "";
 }
+function decodeXml(bytes) {
+  const b = bytes instanceof Uint8Array ? bytes : new Uint8Array(bytes);
+  if (b[0] === 172 && b[1] === 237) throw new Error("This is a compiled JasperReports file; import the .jrxml source instead.");
+  if (b[0] === 255 && b[1] === 254) return new TextDecoder("utf-16le").decode(b.subarray(2));
+  if (b[0] === 254 && b[1] === 255) return new TextDecoder("utf-16be").decode(b.subarray(2));
+  if (b[0] === 239 && b[1] === 187 && b[2] === 191) return new TextDecoder("utf-8").decode(b.subarray(3));
+  const decl = /^\s*<\?xml[^>]*?\sencoding\s*=\s*["']([A-Za-z0-9._-]+)["']/.exec(String.fromCharCode(...b.subarray(0, 200)));
+  let enc = decl ? decl[1].toLowerCase() : "utf-8";
+  if (enc === "utf-16" || enc === "unicode") enc = "utf-8";
+  try {
+    return new TextDecoder(enc).decode(b);
+  } catch {
+    return new TextDecoder("utf-8").decode(b);
+  }
+}
 function importXmlReport(text2, opts = {}) {
   const root = rootName(String(text2 ?? ""));
   if (root === "jasperReport") return importJrxml(text2, opts);
@@ -17440,9 +17549,337 @@ var init_importers = __esm({
   }
 });
 
-// bin/pw.mjs
+// src/importers/batch.js
+var batch_exports = {};
+__export(batch_exports, {
+  BATCH_LIMITS: () => BATCH_LIMITS,
+  MANIFEST: () => MANIFEST,
+  exitCode: () => exitCode,
+  importFolder: () => importFolder,
+  reportHtml: () => reportHtml
+});
 import fs from "node:fs";
 import path from "node:path";
+import crypto2 from "node:crypto";
+function walk(root, o) {
+  const files = [];
+  const refused = [];
+  let capped2 = false;
+  const visit = (dir, rel2) => {
+    for (const ent of fs.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name < b.name ? -1 : 1)) {
+      if (capped2) return;
+      const r = join(rel2, ent.name), abs = path.join(dir, ent.name);
+      let real = abs, st;
+      try {
+        if (ent.isSymbolicLink()) {
+          real = fs.realpathSync(abs);
+          if (!inside(root, real)) {
+            refused.push({ path: r, reason: "a symbolic link to outside the input folder: not followed" });
+            continue;
+          }
+          st = fs.statSync(real);
+          if (st.isDirectory()) {
+            refused.push({ path: r, reason: "a symbolic link to a folder: not followed" });
+            continue;
+          }
+        } else st = fs.statSync(abs);
+      } catch (e2) {
+        refused.push({ path: r, reason: `cannot be read (${e2 instanceof Error ? e2.message : e2})` });
+        continue;
+      }
+      if (st.isDirectory()) {
+        if (o.recursive && real !== o.skip) visit(abs, r);
+        continue;
+      }
+      if (!st.isFile() || !(REPORT.test(r) || IMAGE.test(r) || RESOURCE.test(r))) continue;
+      if (files.length >= o.maxFiles) {
+        capped2 = true;
+        refused.push({ path: r, reason: `more than ${o.maxFiles} files: this one and the rest are not imported (--max-files)` });
+        return;
+      }
+      files.push({ rel: r, abs: real, size: st.size });
+    }
+  };
+  visit(root, "");
+  return { files, refused };
+}
+function positions(text2) {
+  let starts = null;
+  return (pos) => {
+    if (typeof pos !== "number") return {};
+    starts ||= [0, ...[...text2.matchAll(/\n/g)].map((m) => (
+      /** @type {number} */
+      m.index + 1
+    ))];
+    let lo = 0, hi = starts.length - 1;
+    while (lo < hi) {
+      const mid = lo + hi + 1 >> 1;
+      if (starts[mid] <= pos) lo = mid;
+      else hi = mid - 1;
+    }
+    return { line: lo + 1, column: pos - starts[lo] + 1 };
+  };
+}
+function* objects(o, depth = 0) {
+  if (!o || typeof o !== "object" || depth > 200) return;
+  yield o;
+  for (const v of Array.isArray(o) ? o : Object.values(o)) if (v && typeof v === "object") yield* objects(v, depth + 1);
+}
+async function importFolder(input, output, opts = {}) {
+  const maxFiles = opts.maxFiles ?? BATCH_LIMITS.maxFiles, maxBytes = opts.maxBytes ?? BATCH_LIMITS.maxBytes;
+  const log = opts.log || (() => {
+  });
+  const inRoot = fs.realpathSync(input);
+  if (!fs.statSync(inRoot).isDirectory()) throw new Error(`${input} is not a folder`);
+  fs.mkdirSync(output, { recursive: true });
+  const outRoot = fs.realpathSync(output);
+  const { files, refused } = walk(inRoot, { recursive: opts.recursive, maxFiles, skip: outRoot });
+  let old = {};
+  try {
+    const m = JSON.parse(fs.readFileSync(path.join(outRoot, MANIFEST), "utf8"));
+    if (m && typeof m.files === "object") old = m.files;
+  } catch {
+  }
+  const manifest = {};
+  for (const [k, v] of Object.entries(old)) if (typeof v === "string" && /^[0-9a-f]{64}$/.test(v)) manifest[k] = v;
+  function writeTarget(rel2, bytes) {
+    const abs = path.resolve(outRoot, ...rel2.split("/"));
+    if (!inside(outRoot, abs) || abs === outRoot) throw new Error(`the output path ${rel2} is outside the output folder`);
+    fs.mkdirSync(path.dirname(abs), { recursive: true });
+    if (!inside(outRoot, fs.realpathSync(path.dirname(abs)))) throw new Error(`the output folder of ${rel2} is a link to outside the output folder`);
+    const h = sha2(bytes);
+    let st = null;
+    try {
+      st = fs.lstatSync(abs);
+    } catch {
+    }
+    if (st && !st.isFile()) throw new Error(`${rel2} is in the output folder and is not a plain file (a link or a folder): not overwritten`);
+    let previous2, cur;
+    if (st) {
+      previous2 = fs.readFileSync(abs);
+      cur = sha2(previous2);
+      if (cur === h) {
+        manifest[rel2] = h;
+        return { write: "unchanged", previous: previous2 };
+      }
+      if (cur !== old[rel2] && !opts.force) return { write: "skipped-edited", previous: previous2 };
+    }
+    const tmp = path.join(path.dirname(abs), `.${path.basename(abs)}.${process.pid}.tmp`);
+    fs.rmSync(tmp, { force: true });
+    fs.writeFileSync(tmp, bytes, { flag: "wx" });
+    fs.renameSync(tmp, abs);
+    manifest[rel2] = h;
+    return { write: !st ? "written" : cur !== old[rel2] ? "overwritten" : "refreshed", previous: previous2 };
+  }
+  const byRel = new Map(files.map((f4) => [f4.rel, f4]));
+  function find(test, ref2, fromDir) {
+    const r = String(ref2 ?? "").trim().replace(/\\/g, "/").replace(/^file:(\/\/)?/i, "");
+    if (!r || /^[a-z][a-z0-9+.-]*:/i.test(r) && !/^[a-z]:\//i.test(r)) return null;
+    if (!r.startsWith("/") && !/^[a-z]:\//i.test(r)) {
+      const rel2 = path.posix.normalize(join(fromDir, r));
+      const hit = !rel2.startsWith("../") && byRel.get(rel2);
+      if (hit && test.test(hit.rel)) return hit;
+    }
+    const base = r.split("/").pop()?.toLowerCase();
+    const cands = files.filter((f4) => test.test(f4.rel) && (path.posix.basename(f4.rel).toLowerCase() === base || stemOf(f4.rel).toLowerCase() === base));
+    return cands.find((f4) => dirOf(f4.rel) === fromDir) || cands[0] || null;
+  }
+  const readText = (f4) => {
+    if (f4.size > maxBytes) throw new Error(`${f4.rel} is larger than ${maxBytes} bytes`);
+    return decodeXml(fs.readFileSync(f4.abs));
+  };
+  const reports = files.filter((f4) => REPORT.test(f4.rel));
+  const taken = /* @__PURE__ */ new Set();
+  const outOf = new Map(reports.map((f4) => {
+    const dir = dirOf(f4.rel);
+    let id = reportId(path.posix.basename(f4.rel));
+    if (taken.has(join(dir, id))) id = `${id}-${extOf(f4.rel)}`.slice(0, 64);
+    for (let k = 2; taken.has(join(dir, id)); k++) id = `${reportId(path.posix.basename(f4.rel))}-${k}`;
+    taken.add(join(dir, id));
+    return [f4.rel, { dir, id, rel: join(dir, `${id}.pw.json`) }];
+  }));
+  const images = /* @__PURE__ */ new Map();
+  const results = [];
+  for (const f4 of reports) {
+    const o = (
+      /** @type {{ dir: string, id: string, rel: string }} */
+      outOf.get(f4.rel)
+    );
+    const rec = { source: f4.rel, format: FORMAT[extOf(f4.rel)], output: o.rel, status: "failed", stats: { items: 0, mapped: 0, approximated: 0, dropped: 0 }, items: [], expressions: [], notes: [], references: [] };
+    results.push(rec);
+    try {
+      const text2 = readText(f4);
+      const at3 = positions(text2);
+      const resolve = (kind, ref2) => {
+        const hit = find(kind === "datasource" ? /\.rds$/i : /\.jrtx$/i, ref2, o.dir);
+        rec.references.push({ kind: kind === "datasource" ? "shared data source" : "style template", ref: ref2, resolved: hit ? hit.rel : null });
+        return hit ? readText(hit) : null;
+      };
+      const name = stemOf(f4.rel);
+      const r = extOf(f4.rel) === "rdlx-json" ? importRdlx(JSON.parse(text2.replace(/^/, "")), { name }) : importXmlReport(text2, { name, resolve });
+      if (r.error) throw new Error(r.error);
+      const def = r.definition;
+      rec.stats = r.stats;
+      const itemLines = /* @__PURE__ */ new Set();
+      for (const it of r.items || []) {
+        const p = at3(it.pos);
+        rec.items.push({ name: it.name, state: it.state, ...p, notes: it.notes });
+        for (const n6 of it.notes) itemLines.add(`${it.name}: ${n6.message}`);
+        for (const e2 of it.exprs) rec.expressions.push({ item: it.name, expression: e2, ...p });
+      }
+      rec.notes = r.warnings.filter((w2) => !itemLines.has(w2));
+      for (const s of objects(def)) {
+        if (s.type !== "subreport" || typeof s.report !== "string") continue;
+        const hits = reports.filter((x) => outOf.get(x.rel)?.id === s.report);
+        const hit = hits.find((x) => dirOf(x.rel) === o.dir) || hits[0];
+        const where = hit && /** @type {any} */
+        outOf.get(hit.rel).rel;
+        rec.references.push({
+          kind: "subreport",
+          ref: s.report,
+          resolved: hit ? hit.rel : null,
+          ...hit ? { output: where } : {},
+          ...hit && dirOf(hit.rel) !== o.dir ? { note: `it is imported to ${where}, another folder: pw render finds a subreport next to its report (the server by its id)` } : {}
+        });
+      }
+      for (const im of objects(def)) {
+        if (im.type !== "image" || typeof im.src !== "string" || !im.src || im.src.startsWith("=") || /^(https?:|data:|embedded:)/i.test(im.src)) continue;
+        const hit = find(IMAGE, im.src, dirOf(f4.rel));
+        if (!hit) {
+          rec.references.push({ kind: "image", ref: im.src, resolved: null });
+          continue;
+        }
+        if (hit.size > maxBytes) {
+          rec.references.push({ kind: "image", ref: im.src, resolved: null, note: `${hit.rel} is larger than ${maxBytes} bytes` });
+          continue;
+        }
+        const bytes = fs.readFileSync(hit.abs), h = sha2(bytes);
+        let copy = images.get(h);
+        if (!copy) {
+          const base = path.posix.basename(hit.rel);
+          copy = join(o.dir, base);
+          if ([...images.values()].includes(copy)) copy = join(o.dir, `${stemOf(base)}-${h.slice(0, 8)}${path.posix.extname(base)}`);
+          const w2 = writeTarget(copy, bytes);
+          if (w2.write === "skipped-edited") rec.notes.push(`The image ${copy} in the output folder was changed since the last import, so it was not replaced (--force replaces it).`);
+          images.set(h, copy);
+        }
+        rec.references.push({ kind: "image", ref: im.src, resolved: hit.rel, output: copy });
+        im.src = path.posix.relative(o.dir, copy);
+      }
+      if (extOf(f4.rel) === "rptdesign") {
+        const libs = /<list-property\s+name="libraries">([\s\S]*?)<\/list-property>/.exec(text2)?.[1] || "";
+        for (const m of libs.matchAll(/<property\s+name="fileName">([^<]{1,500})<\/property>/g)) {
+          const hit = find(/\.rptlibrary$/i, m[1], o.dir);
+          rec.references.push({ kind: "BIRT library", ref: m[1], resolved: hit ? hit.rel : null, note: "the BIRT importer does not read libraries: items from it are missing" });
+        }
+      }
+      const w = writeTarget(o.rel, JSON.stringify(def, null, 2) + "\n");
+      rec.status = "imported";
+      rec.write = w.write;
+      if (w.write === "skipped-edited") rec.notes.unshift(`${o.rel} was changed since the last import, so it was not overwritten (--force overwrites it).`);
+      log(`${f4.rel} → ${o.rel}: ${w.write}${rec.references.some((x) => !x.resolved) ? `, ${rec.references.filter((x) => !x.resolved).length} unresolved` : ""}`);
+      if (opts.verify) {
+        let baseline = null, onDisk = def;
+        try {
+          if (w.write === "skipped-edited") onDisk = JSON.parse(fs.readFileSync(path.join(outRoot, ...o.rel.split("/")), "utf8"));
+          else if (w.previous && w.write !== "unchanged") baseline = JSON.parse(w.previous.toString("utf8"));
+        } catch {
+        }
+        try {
+          rec.verify = await opts.verify({ file: path.join(outRoot, ...o.rel.split("/")), definition: onDisk, baseline });
+        } catch (e2) {
+          rec.verify = { status: "failed", error: e2 instanceof Error ? e2.message : String(e2) };
+        }
+      }
+    } catch (e2) {
+      rec.status = "failed";
+      rec.error = e2 instanceof Error ? e2.message : String(e2);
+      log(`${f4.rel}: FAILED: ${rec.error}`);
+    }
+  }
+  fs.writeFileSync(path.join(outRoot, MANIFEST), JSON.stringify({ version: 1, note: "pw import: the hash of each file as written; a file whose hash differs was edited and is not overwritten without --force", files: manifest }, null, 2) + "\n");
+  const n5 = (s) => results.filter((r) => r.status === s).length;
+  return {
+    tool: "pw import",
+    schema: 1,
+    created: (/* @__PURE__ */ new Date()).toISOString(),
+    input: inRoot,
+    output: outRoot,
+    options: { recursive: !!opts.recursive, force: !!opts.force, verify: !!opts.verify, maxFiles, maxBytes },
+    summary: {
+      reports: results.length,
+      imported: n5("imported"),
+      failed: n5("failed"),
+      refused: refused.length,
+      images: images.size,
+      skippedEdited: results.filter((r) => r.write === "skipped-edited").length,
+      unresolved: results.reduce((k, r) => k + r.references.filter((x) => !x.resolved).length, 0)
+    },
+    files: results,
+    refused
+  };
+}
+function reportHtml(r) {
+  const s = r.summary;
+  const verifyCell = (v) => !v ? "" : `<span class="v-${esc8(v.status)}">${esc8(v.status)}</span>`;
+  const rows = r.files.map((f4, i) => `<tr class="${f4.status}"><td><a href="#f${i}">${esc8(f4.source)}</a></td><td>${esc8(f4.format)}</td><td>${esc8(f4.status)}${f4.write ? ` · ${esc8(f4.write)}` : ""}</td><td class="n">${f4.stats.mapped}</td><td class="n">${f4.stats.approximated}</td><td class="n">${f4.stats.dropped}</td><td class="n">${f4.expressions.length}</td><td class="n">${f4.references.filter(
+  (x) => !x.resolved).length}</td><td>${verifyCell(f4.verify)}</td></tr>`).join("\n");
+  const detail = r.files.map((f4, i) => {
+    const items = f4.items.filter((it) => it.notes.length);
+    return `<section id="f${i}"><h2>${esc8(f4.source)} <small>${esc8(f4.format)} → ${esc8(f4.output)}</small></h2>` + (f4.error ? `<p class="err">Failed: ${esc8(f4.error)}</p>` : "") + (f4.references.length ? `<h3>References</h3><table><tr><th>Kind</th><th>Name</th><th>Resolved to</th><th>Note</th></tr>${f4.references.map((x) => `<tr class="${x.resolved ? "" : "failed"}"><td>${esc8(x.kind)}</td>${
+""}<td><code>${esc8(x.ref)}</code></td><td>${x.resolved ? esc8(x.resolved) + (x.output ? ` → ${esc8(x.output)}` : "") : "<b>unresolved</b>"}</td><td>${esc8(x.note)}</td></tr>`).join("")}</table>` : "") + (f4.expressions.length ? `<h3>Expressions not translated</h3><table><tr><th>Line:col</th><th>Item</th><th>Expression</th></tr>${f4.expressions.map((e2) => `<tr><td>${esc8(at2(e2))}</td><td>${esc8(e2.
+    item)}</td><td><code>${esc8(e2.expression)}</code></td></tr>`).join("")}</table>` : "") + (items.length ? `<h3>Items</h3><table><tr><th>Line:col</th><th>Item</th><th>Status</th><th>Why</th></tr>${items.map((it) => `<tr class="${esc8(it.state)}"><td>${esc8(at2(it))}</td><td>${esc8(it.name)}</td><td>${esc8(it.state)}</td><td><ul>${it.notes.map((n5) => `<li class="${esc8(n5.kind)}">${esc8(n5.message)}${
+""}</li>`).join("")}</ul></td></tr>`).join("")}</table>` : "") + (f4.notes.length ? `<h3>Report notes</h3><ul>${f4.notes.map((n5) => `<li>${esc8(n5)}</li>`).join("")}</ul>` : "") + (f4.verify ? `<h3>Verify</h3><p>${verifyCell(f4.verify)} ${esc8(f4.verify.note || f4.verify.error || "")}${f4.verify.pages != null ? ` (${f4.verify.pages} pages)` : ""}</p>${f4.verify.diff?.length ? `<pre>${esc8(f4.verify.
+    diff.join("\n"))}</pre>` : ""}` : "") + "</section>";
+  }).join("\n");
+  return `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Import report</title><style>
+:root{color-scheme:light dark;--bg:#fff;--fg:#1d2025;--mute:#636a74;--line:#dfe2e6;--bad:#b42318;--warn:#9a6700;--ok:#1a7f37;--head:#f4f5f7}
+@media (prefers-color-scheme:dark){:root{--bg:#16181c;--fg:#e6e8eb;--mute:#9aa1ab;--line:#30343a;--bad:#ff7b72;--warn:#d29922;--ok:#3fb950;--head:#1f2228}}
+body{margin:0;padding:16px 24px;background:var(--bg);color:var(--fg);font:14px/1.45 system-ui,sans-serif}
+h1{font-size:20px;margin:0 0 4px}h2{font-size:16px;margin:28px 0 6px;border-top:1px solid var(--line);padding-top:14px;overflow-wrap:anywhere}h2 small{color:var(--mute);font-weight:400}h3{font-size:14px;margin:14px 0 4px}
+p.meta{color:var(--mute);margin:0 0 12px;overflow-wrap:anywhere}
+table{border-collapse:collapse;width:100%;margin:4px 0}th,td{border-bottom:1px solid var(--line);padding:4px 8px;text-align:left;vertical-align:top;overflow-wrap:anywhere}
+th{background:var(--head);font-weight:600}td.n{text-align:right;font-variant-numeric:tabular-nums;white-space:nowrap}
+tr.failed td:first-child,.err,li.dropped,.v-failed,.v-changed{color:var(--bad)}tr.dropped td,li.approximated{color:var(--warn)}.v-ok{color:var(--ok)}
+code,pre{font:12px/1.4 ui-monospace,monospace;white-space:pre-wrap;overflow-wrap:anywhere}ul{margin:0;padding-left:18px}
+.cards{display:flex;flex-wrap:wrap;gap:8px;margin:8px 0 16px}.cards div{border:1px solid var(--line);border-radius:6px;padding:6px 12px}.cards b{display:block;font-size:18px}
+</style></head><body><h1>Import report</h1>
+<p class="meta">${esc8(r.input)} → ${esc8(r.output)} · ${esc8(r.created)}</p>
+<div class="cards"><div><b>${s.reports}</b>reports</div><div><b>${s.imported}</b>imported</div><div><b>${s.failed}</b>failed</div><div><b>${s.unresolved}</b>unresolved references</div><div><b>${s.images}</b>images copied</div><div><b>${s.skippedEdited}</b>kept (edited)</div><div><b>${s.refused}</b>refused</div></div>
+<table><tr><th>File</th><th>Format</th><th>Status</th><th>Mapped</th><th>Approximated</th><th>Dropped</th><th>Expressions not translated</th><th>Unresolved</th><th>Verify</th></tr>
+${rows}</table>
+${r.refused.length ? `<h2>Refused</h2><ul>${r.refused.map((x) => `<li><code>${esc8(x.path)}</code>: ${esc8(x.reason)}</li>`).join("")}</ul>` : ""}
+${detail}
+</body></html>
+`;
+}
+var BATCH_LIMITS, MANIFEST, REPORT, IMAGE, RESOURCE, FORMAT, sha2, inside, extOf, stemOf, dirOf, join, exitCode, esc8, at2;
+var init_batch = __esm({
+  "src/importers/batch.js"() {
+    init_importers();
+    init_rdlx();
+    BATCH_LIMITS = { maxFiles: 2e3, maxBytes: 16 * 1024 * 1024 };
+    MANIFEST = ".pw-import.json";
+    REPORT = /\.(rdlc?|jrxml|rptdesign|rdlx-json)$/i;
+    IMAGE = /\.(png|jpe?g|gif|svg|bmp|webp)$/i;
+    RESOURCE = /\.(rds|jrtx|rptlibrary)$/i;
+    FORMAT = { rdl: "SSRS", rdlc: "SSRS", jrxml: "JasperReports", rptdesign: "BIRT", "rdlx-json": "ActiveReports" };
+    sha2 = (b) => crypto2.createHash("sha256").update(b).digest("hex");
+    inside = (root, p) => p === root || p.startsWith(root + path.sep);
+    extOf = (f4) => /\.rdlx-json$/i.test(f4) ? "rdlx-json" : path.extname(f4).slice(1).toLowerCase();
+    stemOf = (f4) => path.basename(f4).replace(/\.rdlx-json$/i, "").replace(/\.[^.]+$/, "");
+    dirOf = (rel2) => path.posix.dirname(rel2) === "." ? "" : path.posix.dirname(rel2);
+    join = (dir, f4) => dir ? `${dir}/${f4}` : f4;
+    exitCode = (report) => !report.summary.imported ? 1 : report.summary.failed ? 2 : 0;
+    esc8 = (s) => String(s ?? "").replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+    at2 = (o) => o.line ? `${o.line}:${o.column}` : "";
+  }
+});
+
+// bin/pw.mjs
+import fs2 from "node:fs";
+import path2 from "node:path";
 import { createRequire } from "node:module";
 import { parseArgs } from "node:util";
 
@@ -17807,10 +18244,10 @@ var TextMeasurer = class {
   wrapComplex(para2, key, size, maxWidth, dir, sp, out) {
     const tokens = [];
     const sa = SA.test(para2) ? saBreaks(para2) : null;
-    let cur = "", space = false, prev = "", at2 = 0;
+    let cur = "", space = false, prev = "", at3 = 0;
     for (const ch of para2) {
-      const i = at2;
-      at2 += ch.length;
+      const i = at3;
+      at3 += ch.length;
       if (ch === " ") {
         if (cur) {
           tokens.push({ text: cur, space });
@@ -18961,7 +19398,7 @@ function paintRound(type, g) {
   return paintPie(type, g);
 }
 function paintPie(type, g) {
-  const { item, data, out, X, W: W2, top, bottom, fs: fs2, bold, text: text2, measure, fmtV, pointFill, pointLink, pal, label, labelText, anim } = g;
+  const { item, data, out, X, W: W2, top, bottom, fs: fs3, bold, text: text2, measure, fmtV, pointFill, pointLink, pal, label, labelText, anim } = g;
   const vals = (data.series[0]?.values || []).map((v) => Math.max(0, v || 0));
   const total = vals.reduce((a, b) => a + b, 0) || 1;
   const showL = item.showValues !== false;
@@ -18990,7 +19427,7 @@ function paintPie(type, g) {
       lw[0] *= k;
       lw[1] *= k;
     }
-    r = Math.max(4, Math.min((W2 - lw[0] - lw[1] - gap * 2) / 2, (bottom - top) / 2 - fs2));
+    r = Math.max(4, Math.min((W2 - lw[0] - lw[1] - gap * 2) / 2, (bottom - top) / 2 - fs3));
     const slack = W2 - lw[0] - lw[1] - gap * 2 - r * 2;
     cx = X + gap + lw[0] + r + slack / 2;
   } else r = Math.max(4, Math.min(W2, bottom - top) / 2 - 6);
@@ -19010,16 +19447,16 @@ function paintPie(type, g) {
     else if (!outside && frac >= 0.05 && showL) {
       const s = item.labelTemplate ? labelText(i, data.series[0], v, frac) : pctOf(v);
       const lr = ri ? (r + ri) / 2 : r * 0.62;
-      label(s, cx + Math.cos(mid) * lr, cy + Math.sin(mid) * lr + fs2 * 0.35, { color: inkOn(fill3), f: bold, size: fs2 });
+      label(s, cx + Math.cos(mid) * lr, cy + Math.sin(mid) * lr + fs3 * 0.35, { color: inkOn(fill3), f: bold, size: fs3 });
     }
     a0 = a1;
   });
-  if (outside) placeOutside(sides, { cx, cy, r, lw, lh: fs2 * 1.3, lo: top + fs2 * 0.9, hi: bottom - fs2 * 0.4, out, text: text2, texts, fs: fs2, ink: g.ink });
+  if (outside) placeOutside(sides, { cx, cy, r, lw, lh: fs3 * 1.3, lo: top + fs3 * 0.9, hi: bottom - fs3 * 0.4, out, text: text2, texts, fs: fs3, ink: g.ink });
   if (type === "donut" && item.centerText !== false) {
-    text2(fmtV(total), cx, cy + fs2 * 0.45, { align: "center", size: fs2 * 1.4, f: bold, color: "#111827" });
+    text2(fmtV(total), cx, cy + fs3 * 0.45, { align: "center", size: fs3 * 1.4, f: bold, color: "#111827" });
   }
 }
-function placeOutside(sides, { cx, cy, r, lw, lh, lo, hi, out, text: text2, texts, fs: fs2, ink }) {
+function placeOutside(sides, { cx, cy, r, lw, lh, lo, hi, out, text: text2, texts, fs: fs3, ink }) {
   sides.forEach((list2, right) => {
     const room = Math.max(1, Math.floor((hi - lo) / lh) + 1);
     if (list2.length > room) {
@@ -19044,16 +19481,16 @@ function placeOutside(sides, { cx, cy, r, lw, lh, lo, hi, out, text: text2, text
       const ex2 = cx + c * (r + 8), ey = cy + s * (r + 8);
       const kx = cx + dir * (r + 12);
       out.push({ t: "path", x: 0, y: 0, d: `M ${f(cx + c * r)} ${f(cy + s * r)} L ${f(ex2)} ${f(ey)} L ${f(kx)} ${f(l.y)}`, fill: null, stroke: "#9ca3af", strokeWidth: 0.6 });
-      text2(texts[l.i], kx + dir * 3, l.y + fs2 * 0.35, { align: right ? "left" : "right", maxW: Math.max(fs2, lw[right] + 1), color: ink });
+      text2(texts[l.i], kx + dir * 3, l.y + fs3 * 0.35, { align: right ? "left" : "right", maxW: Math.max(fs3, lw[right] + 1), color: ink });
     }
   });
 }
 function paintRadar(g) {
-  const { item, data, out, X, W: W2, top, bottom, fs: fs2, text: text2, measure, fmtV, pointLink, label, labelsOn, labelText, grid, anim, axes } = g;
+  const { item, data, out, X, W: W2, top, bottom, fs: fs3, text: text2, measure, fmtV, pointLink, label, labelsOn, labelText, grid, anim, axes } = g;
   const n5 = data.categories.length;
   const catW = Math.min(W2 * 0.25, data.categories.reduce((m, c) => Math.max(m, measure(c).w), 10));
-  const cx = X + W2 / 2, cy = (top + bottom) / 2 + fs2 * 0.3;
-  const R2 = Math.max(6, Math.min(W2 / 2 - catW - 8, (bottom - top) / 2 - fs2 * 1.6));
+  const cx = X + W2 / 2, cy = (top + bottom) / 2 + fs3 * 0.3;
+  const R2 = Math.max(6, Math.min(W2 / 2 - catW - 8, (bottom - top) / 2 - fs3 * 1.6));
   let lo = 0, hi = 0;
   for (const s of data.series) for (const v of s.values) if (v != null) {
     lo = Math.min(lo, v);
@@ -19065,34 +19502,34 @@ function paintRadar(g) {
   const ticks = linearTicks(a, b, sc.step);
   const rad = (v) => Math.max(0, Math.min(1, (v - a) / (b - a || 1))) * R2;
   const ang = (i) => -Math.PI / 2 + i / Math.max(1, n5) * Math.PI * 2;
-  const at2 = (i, r) => ({ x: cx + Math.cos(ang(i)) * r, y: cy + Math.sin(ang(i)) * r });
-  const poly = (r) => Array.from({ length: n5 }, (_, i) => at2(i, r)).map((p, i) => `${i ? "L" : "M"} ${f(p.x)} ${f(p.y)}`).join(" ") + " Z";
+  const at3 = (i, r) => ({ x: cx + Math.cos(ang(i)) * r, y: cy + Math.sin(ang(i)) * r });
+  const poly = (r) => Array.from({ length: n5 }, (_, i) => at3(i, r)).map((p, i) => `${i ? "L" : "M"} ${f(p.x)} ${f(p.y)}`).join(" ") + " Z";
   if (ys.gridlines !== false) {
     for (const t of ticks) if (rad(t) > 0) out.push({ t: "path", x: 0, y: 0, d: n5 > 2 ? poly(rad(t)) : "", fill: null, stroke: grid, strokeWidth: 0.5 });
   }
   for (let i = 0; i < n5; i++) {
-    const e2 = at2(i, R2);
+    const e2 = at3(i, R2);
     out.push({ t: "line", x1: cx, y1: cy, x2: e2.x, y2: e2.y, stroke: grid, strokeWidth: 0.5 });
   }
-  for (const t of ticks) if (rad(t) > 0 && rad(t) < R2 - 0.5) text2(fmtV(t), cx + 3, cy - rad(t) + fs2 * 0.3, { size: fs2 * 0.8, color: "#6b7280" });
+  for (const t of ticks) if (rad(t) > 0 && rad(t) < R2 - 0.5) text2(fmtV(t), cx + 3, cy - rad(t) + fs3 * 0.3, { size: fs3 * 0.8, color: "#6b7280" });
   data.categories.forEach((c, i) => {
-    const p = at2(i, R2 + 4), cos = Math.cos(ang(i));
-    text2(c, p.x, p.y + fs2 * 0.35 + (Math.sin(ang(i)) > 0.5 ? fs2 * 0.5 : 0), { align: Math.abs(cos) < 0.2 ? "center" : cos > 0 ? "left" : "right", maxW: catW });
+    const p = at3(i, R2 + 4), cos = Math.cos(ang(i));
+    text2(c, p.x, p.y + fs3 * 0.35 + (Math.sin(ang(i)) > 0.5 ? fs3 * 0.5 : 0), { align: Math.abs(cos) < 0.2 ? "center" : cos > 0 ? "left" : "right", maxW: catW });
   });
   data.series.forEach((s, si) => {
-    const pts2 = s.values.map((v, i) => v == null ? null : { ...at2(i, rad(v)), v, i }).filter(Boolean);
+    const pts2 = s.values.map((v, i) => v == null ? null : { ...at3(i, rad(v)), v, i }).filter(Boolean);
     if (!pts2.length) return;
     const d = pts2.map((p, i) => `${i ? "L" : "M"} ${f(p.x)} ${f(p.y)}`).join(" ") + " Z";
     out.push(tag({ t: "path", x: 0, y: 0, d, fill: s.color + (s.def.type === "line" ? "00" : "2e"), stroke: s.color, strokeWidth: 1.4 }, anim && { k: anim === "grow" ? "scale" : "fade", i: si }));
     if (n5 <= 40) for (const p of pts2) out.push({ t: "ellipse", cx: p.x, cy: p.y, rx: 1.8, ry: 1.8, fill: s.color, stroke: null });
     for (const p of pts2) pointLink(p.i, { x: p.x - 4, y: p.y - 4, w: 8, h: 8 }, `${data.categories[p.i]}${data.series.length > 1 ? ` · ${s.name}` : ""}: ${fmtV(p.v)}`);
-    if (labelsOn || item.labelTemplate) for (const p of pts2) label(labelText(p.i, s, p.v), p.x, p.y - 3, { size: fs2 * 0.85 });
+    if (labelsOn || item.labelTemplate) for (const p of pts2) label(labelText(p.i, s, p.v), p.x, p.y - 3, { size: fs3 * 0.85 });
   });
 }
 var GAUGE_SHAPES = { half: [Math.PI, Math.PI], threeQuarter: [Math.PI * 0.75, Math.PI * 1.5], full: [-Math.PI / 2, Math.PI * 2] };
 var GAUGE_INDICATORS = ["needle", "pointer", "bar"];
 function paintGauge(g) {
-  const { item, data, out, X, W: W2, top, bottom, fs: fs2, bold, text: text2, fmtV, pointLink, axes, lc, who, safe: safe3, ctx } = g;
+  const { item, data, out, X, W: W2, top, bottom, fs: fs3, bold, text: text2, fmtV, pointLink, axes, lc, who, safe: safe3, ctx } = g;
   const v = data.series[0]?.values?.[0] ?? null;
   const ys = axes.y || {};
   const num6 = (x) => x == null || x === "" ? null : Number.isFinite(Number(x)) ? Number(x) : null;
@@ -19111,14 +19548,14 @@ function paintGauge(g) {
     R2 = Math.max(8, Math.min(W2 / 2 - 8, H / 2 - 4));
     cy = (top + bottom) / 2;
   } else if (shape2 === "threeQuarter") {
-    R2 = Math.max(8, Math.min(W2 / 2 - 8, (H - fs2 * 1.4 - 4) / (1 + Math.SQRT1_2)));
+    R2 = Math.max(8, Math.min(W2 / 2 - 8, (H - fs3 * 1.4 - 4) / (1 + Math.SQRT1_2)));
     cy = top + 4 + R2;
   } else {
-    R2 = Math.max(8, Math.min(W2 / 2 - 8, H - fs2 * 3.6));
+    R2 = Math.max(8, Math.min(W2 / 2 - 8, H - fs3 * 3.6));
     cy = top + 4 + R2;
   }
   const th = R2 * 0.22;
-  const at2 = (a2, rad) => ({ x: cx + Math.cos(a2) * rad, y: cy + Math.sin(a2) * rad });
+  const at3 = (a2, rad) => ({ x: cx + Math.cos(a2) * rad, y: cy + Math.sin(a2) * rad });
   const scope = { ...ctx, fields: data.rows[0] || null, aggRows: data.rows, aggIndex: void 0 };
   const val = (o, k) => typeof o[k] === "number" ? o[k] : num6(safe3(o[k], scope, lc, who));
   const overlays = (Array.isArray(item.overlays) ? item.overlays : []).slice(0, 20).filter((o) => o && typeof o === "object");
@@ -19139,55 +19576,55 @@ function paintGauge(g) {
   for (const o of overlays) if (o.type === "line") {
     const t = val(o, "value");
     if (t == null) continue;
-    const a2 = ang(t), p1 = at2(a2, R2 - th - 2), p2 = at2(a2, R2 + 2);
+    const a2 = ang(t), p1 = at3(a2, R2 - th - 2), p2 = at3(a2, R2 + 2);
     out.push({ t: "line", x1: p1.x, y1: p1.y, x2: p2.x, y2: p2.y, stroke: o.color || "#111827", strokeWidth: 1.5 });
   }
   const sc = niceScale(lo, hi, shape2 === "half" ? 5 : 7);
   const ticks = linearTicks(Math.ceil(lo / sc.step - 1e-9) * sc.step, hi, sc.step).filter((t) => t >= lo - 1e-9 && t <= hi + 1e-9);
-  const tickOn = item.gaugeTicks !== false && R2 >= fs2 * 5 && ticks.length > 1;
+  const tickOn = item.gaugeTicks !== false && R2 >= fs3 * 5 && ticks.length > 1;
   if (tickOn) {
     const ri = R2 - th - 1;
     const minor = sc.step / 5;
     for (let t = ticks[0] - sc.step, k = 0; t <= hi + 1e-9 && k < 200; t += minor, k++) {
       if (t < lo - 1e-9) continue;
       const isMajor = ticks.some((m) => Math.abs(m - t) < minor / 2);
-      const a2 = ang(t), p1 = at2(a2, ri), p2 = at2(a2, ri - th * (isMajor ? 0.4 : 0.2));
+      const a2 = ang(t), p1 = at3(a2, ri), p2 = at3(a2, ri - th * (isMajor ? 0.4 : 0.2));
       out.push({ t: "line", x1: p1.x, y1: p1.y, x2: p2.x, y2: p2.y, stroke: isMajor ? "#6b7280" : "#9ca3af", strokeWidth: isMajor ? 0.9 : 0.5 });
     }
-    const lr = ri - th * 0.4 - fs2 * 1.1;
+    const lr = ri - th * 0.4 - fs3 * 1.1;
     ticks.forEach((t, k) => {
       if (shape2 === "full" && k === ticks.length - 1 && Math.abs(frac(t) - 1) < 1e-9) return;
-      const p = at2(ang(t), lr);
-      text2(fmtV(t), p.x, p.y + fs2 * 0.3, { align: "center", size: fs2 * 0.8, color: "#6b7280" });
+      const p = at3(ang(t), lr);
+      text2(fmtV(t), p.x, p.y + fs3 * 0.3, { align: "center", size: fs3 * 0.8, color: "#6b7280" });
     });
   } else if (shape2 !== "full") {
-    const e0 = at2(start, R2 - th / 2), e1 = at2(start + sweep2, R2 - th / 2);
-    text2(fmtV(lo), e0.x, e0.y + fs2 * 1.3, { align: "center", color: "#6b7280" });
-    text2(fmtV(hi), e1.x, e1.y + fs2 * 1.3, { align: "center", color: "#6b7280" });
+    const e0 = at3(start, R2 - th / 2), e1 = at3(start + sweep2, R2 - th / 2);
+    text2(fmtV(lo), e0.x, e0.y + fs3 * 1.3, { align: "center", color: "#6b7280" });
+    text2(fmtV(hi), e1.x, e1.y + fs3 * 1.3, { align: "center", color: "#6b7280" });
   }
-  const vy = shape2 === "half" ? cy + fs2 * 2.6 : cy + R2 * 0.5 + fs2 * 0.6;
+  const vy = shape2 === "half" ? cy + fs3 * 2.6 : cy + R2 * 0.5 + fs3 * 0.6;
   if (v == null) {
-    text2("No data", cx, shape2 === "half" ? cy - R2 / 3 : cy + fs2 * 0.35, { align: "center", color: "#9ca3af" });
+    text2("No data", cx, shape2 === "half" ? cy - R2 / 3 : cy + fs3 * 0.35, { align: "center", color: "#9ca3af" });
     return;
   }
   const a = ang(v), ink = typeof item.pointerColor === "string" && /^#[0-9a-f]{6}$/i.test(item.pointerColor) ? item.pointerColor : "#1f2937";
   if (indicator2 === "needle") {
     const len = R2 - th * 0.4, bw = Math.max(1.5, R2 * 0.03);
-    const tip = at2(a, len), n1 = at2(a + Math.PI / 2, bw), n22 = at2(a - Math.PI / 2, bw);
+    const tip = at3(a, len), n1 = at3(a + Math.PI / 2, bw), n22 = at3(a - Math.PI / 2, bw);
     const d = `M ${f(n1.x)} ${f(n1.y)} L ${f(tip.x)} ${f(tip.y)} L ${f(n22.x)} ${f(n22.y)} Z`;
     out.push(tag({ t: "path", x: 0, y: 0, d, fill: ink, stroke: null }, g.anim && { k: "fade", i: 0 }));
     out.push({ t: "ellipse", cx, cy, rx: bw * 1.4, ry: bw * 1.4, fill: ink, stroke: null });
   } else if (indicator2 === "pointer") {
-    const tip = at2(a, R2 - th * 0.85), half = Math.max(0.05, Math.min(0.2, th * 0.55 / Math.max(1, R2 - th)));
-    const b1 = at2(a - half, R2 - th * 1.7), b2 = at2(a + half, R2 - th * 1.7);
+    const tip = at3(a, R2 - th * 0.85), half = Math.max(0.05, Math.min(0.2, th * 0.55 / Math.max(1, R2 - th)));
+    const b1 = at3(a - half, R2 - th * 1.7), b2 = at3(a + half, R2 - th * 1.7);
     const d = `M ${f(b1.x)} ${f(b1.y)} L ${f(tip.x)} ${f(tip.y)} L ${f(b2.x)} ${f(b2.y)} Z`;
     out.push(tag({ t: "path", x: 0, y: 0, d, fill: ink, stroke: "#ffffff", strokeWidth: 0.6 }, g.anim && { k: "fade", i: 0 }));
   }
-  text2(item.labelTemplate ? g.labelText(0, data.series[0], v) : fmtV(v), cx, indicator2 === "needle" || shape2 === "half" ? vy : cy + fs2 * 0.55, { align: "center", size: fs2 * 1.6, f: bold, color: "#111827" });
+  text2(item.labelTemplate ? g.labelText(0, data.series[0], v) : fmtV(v), cx, indicator2 === "needle" || shape2 === "half" ? vy : cy + fs3 * 0.55, { align: "center", size: fs3 * 1.6, f: bold, color: "#111827" });
   pointLink(0, { x: cx - R2, y: cy - R2, w: R2 * 2, h: shape2 === "half" ? R2 : R2 * 2 }, `${data.series[0]?.name || "Value"}: ${fmtV(v)}`);
 }
 function paintFunnel(g) {
-  const { item, data, out, X, W: W2, top, bottom, fs: fs2, text: text2, measure, fmtV, pointFill, pointLink, pal, labelText, anim } = g;
+  const { item, data, out, X, W: W2, top, bottom, fs: fs3, text: text2, measure, fmtV, pointFill, pointLink, pal, labelText, anim } = g;
   const vals = (data.series[0]?.values || []).map((v) => Math.max(0, v || 0));
   const n5 = vals.length;
   let max = 0;
@@ -19197,9 +19634,9 @@ function paintFunnel(g) {
     return;
   }
   const gap = n5 > 1 ? Math.min(2, (bottom - top) / n5 / 4) : 0;
-  const sh = (bottom - top - fs2 * 0.6 - gap * (n5 - 1)) / n5;
+  const sh = (bottom - top - fs3 * 0.6 - gap * (n5 - 1)) / n5;
   const maxW = W2 * 0.62, cx = X + W2 * 0.36;
-  let y = top + fs2 * 0.6;
+  let y = top + fs3 * 0.6;
   const total = vals.reduce((a, b) => a + b, 0) || 1;
   vals.forEach((v, i) => {
     const tw = Math.max(2, maxW * v / max), bw = Math.max(2, i < n5 - 1 ? maxW * vals[i + 1] / max : tw * 0.6);
@@ -19209,7 +19646,7 @@ function paintFunnel(g) {
     pointLink(i, { x: cx - tw / 2, y, w: tw, h: sh }, `${data.categories[i]}: ${fmtV(v)} (${Math.round(v / total * 100)}%)`, d);
     if (item.showValues !== false) {
       const s = item.labelTemplate ? labelText(i, data.series[0], v, v / total) : `${data.categories[i]}: ${fmtV(v)}`;
-      const sz = Math.min(fs2, sh * 0.7);
+      const sz = Math.min(fs3, sh * 0.7);
       const { w } = measure(s, { size: sz });
       const narrow = Math.min(tw, bw);
       if (w + 6 < narrow) text2(s, cx, y + sh / 2 + sz * 0.35, { align: "center", size: sz, color: inkOn(fill3) });
@@ -19270,32 +19707,32 @@ function capRows(g, rows) {
 }
 var noData = (g) => g.text("No data", g.X + g.W / 2, (g.top + g.bottom) / 2, { align: "center", color: "#9ca3af" });
 function frame(g, lo, hi, fmt2, { cats = null, catW = 0 } = {}) {
-  const { item, lc, X, W: W2, top, bottom, fs: fs2, text: text2, out, axes, who, grid } = g;
+  const { item, lc, X, W: W2, top, bottom, fs: fs3, text: text2, out, axes, who, grid } = g;
   const ys = axes.y || {};
-  const plotTop = top + fs2 * 0.6;
+  const plotTop = top + fs3 * 0.6;
   const xTitle = axes.x?.title || item.xTitle, yTitle = ys.title;
-  const plotBottom = bottom - fs2 * 1.8 - (xTitle ? fs2 * 1.6 : 0);
-  const ay = g.valueAxis(ys, lo, hi, Infinity, { includeZero: true, len: plotBottom - plotTop, fs: fs2, fmt: fmt2, lc, who, name: "y" });
-  const valW = Math.max(10, ...ay.ticks.map((t) => lc.m.width(ay.fmt(t), g.font, fs2)));
-  const left = X + 4 + (yTitle ? fs2 * 1.6 : 0) + valW + 6, right = X + W2 - 6;
+  const plotBottom = bottom - fs3 * 1.8 - (xTitle ? fs3 * 1.6 : 0);
+  const ay = g.valueAxis(ys, lo, hi, Infinity, { includeZero: true, len: plotBottom - plotTop, fs: fs3, fmt: fmt2, lc, who, name: "y" });
+  const valW = Math.max(10, ...ay.ticks.map((t) => lc.m.width(ay.fmt(t), g.font, fs3)));
+  const left = X + 4 + (yTitle ? fs3 * 1.6 : 0) + valW + 6, right = X + W2 - 6;
   const vy = (v) => {
     const fr = Math.max(0, Math.min(1, ay.frac(v) ?? 0));
     return ys.reversed ? plotTop + fr * (plotBottom - plotTop) : plotBottom - fr * (plotBottom - plotTop);
   };
   for (const t of ay.ticks) {
     if (ys.gridlines !== false) out.push({ t: "line", x1: left, y1: vy(t), x2: right, y2: vy(t), stroke: grid, strokeWidth: 0.5 });
-    text2(ay.fmt(t), left - 5, vy(t) + fs2 * 0.35, { align: "right" });
+    text2(ay.fmt(t), left - 5, vy(t) + fs3 * 0.35, { align: "right" });
   }
   if (xTitle) text2(xTitle, (left + right) / 2, bottom - 2, { align: "center", color: "#6b7280" });
   if (yTitle) {
     const my = (plotTop + plotBottom) / 2;
-    text2(yTitle, X + 4 + fs2, my, { align: "center", color: "#6b7280", maxW: plotBottom - plotTop, rotate: { a: -90, cx: X + 4 + fs2, cy: my } });
+    text2(yTitle, X + 4 + fs3, my, { align: "center", color: "#6b7280", maxW: plotBottom - plotTop, rotate: { a: -90, cx: X + 4 + fs3, cy: my } });
   }
   const band = (right - left) / Math.max(1, cats ? cats.length : 1);
   if (cats) {
     const every = Math.max(1, Math.ceil((catW + 6) / band));
     cats.forEach((c, i) => {
-      if (i % every === 0) text2(c, left + band * (i + 0.5), plotBottom + fs2 * 1.35, { align: "center", maxW: band * every - 2 });
+      if (i % every === 0) text2(c, left + band * (i + 0.5), plotBottom + fs3 * 1.35, { align: "center", maxW: band * every - 2 });
     });
   }
   return { left, right, plotTop, plotBottom, vy, band, ay };
@@ -19348,7 +19785,7 @@ function squarify(items, x, y, w, h) {
   return out;
 }
 function paintTreemap(g) {
-  const { item, data, out, X, W: W2, top, bottom, fs: fs2, pal, pointFill, pointLink, fmtV, lc, who, anim } = g;
+  const { item, data, out, X, W: W2, top, bottom, fs: fs3, pal, pointFill, pointLink, fmtV, lc, who, anim } = g;
   const s = data.series[0];
   const items = [];
   let dropped = 0;
@@ -19366,10 +19803,10 @@ function paintTreemap(g) {
     out.push({ t: "rect", x: r.x, y: r.y, w: r.w, h: r.h, fill: fill3, stroke: "#ffffff", strokeWidth: 1, ...anim ? { anim: { k: "fade", i: r.i } } : {} });
     const v = s.values[r.i];
     pointLink(r.i, { x: r.x, y: r.y, w: r.w, h: r.h }, `${data.categories[r.i]}: ${fmtV(v)} (${Math.round(v / total * 100)}%)`);
-    if (r.w > fs2 * 3 && r.h > fs2 * 1.6) {
+    if (r.w > fs3 * 3 && r.h > fs3 * 1.6) {
       const ink = inkOn(fill3);
-      g.text(data.categories[r.i], r.x + 4, r.y + fs2 * 1.3, { color: ink, maxW: r.w - 8, f: g.bold });
-      if (r.h > fs2 * 3 && item.showValues !== false) g.text(g.labelText(r.i, s, v, v / total), r.x + 4, r.y + fs2 * 2.5, { color: ink, maxW: r.w - 8, size: fs2 * 0.9 });
+      g.text(data.categories[r.i], r.x + 4, r.y + fs3 * 1.3, { color: ink, maxW: r.w - 8, f: g.bold });
+      if (r.h > fs3 * 3 && item.showValues !== false) g.text(g.labelText(r.i, s, v, v / total), r.x + 4, r.y + fs3 * 2.5, { color: ink, maxW: r.w - 8, size: fs3 * 0.9 });
     }
   }
 }
@@ -19406,7 +19843,7 @@ function binValues(vals, { binCount, binWidth } = {}) {
   return { lo, hi: lo + width * n5, width, counts, capped: capped2 };
 }
 function paintHistogram(g) {
-  const { item, data, out, fs: fs2, lc, who, ctx, pal, axes, anim } = g;
+  const { item, data, out, fs: fs3, lc, who, ctx, pal, axes, anim } = g;
   const s = data.series[0];
   const rows = capRows(g, data.rows);
   const vals = rowValues(g, s?.def?.value || "=0", rows).filter((v) => v != null);
@@ -19422,11 +19859,11 @@ function paintHistogram(g) {
     const x = f4.left + i * bw, y = f4.vy(c), base = f4.vy(0);
     if (c > 0) out.push({ t: "rect", x: x + 0.5, y, w: Math.max(0.5, bw - 1), h: base - y, fill: color2, ...anim ? { anim: { k: anim === "grow" ? "growY" : "fade", o: "bottom", i } } : {} });
     if (item.tooltips !== false) g.links.push({ t: "link", x, y: f4.plotTop, w: bw, h: f4.plotBottom - f4.plotTop, action: null, tip: `${fmtX(b.lo + i * b.width)} – ${fmtX(b.lo + (i + 1) * b.width)}: ${c}` });
-    if (g.labelsOn && c > 0) g.label(String(c), x + bw / 2, y - 3, { size: fs2 * 0.85 });
+    if (g.labelsOn && c > 0) g.label(String(c), x + bw / 2, y - 3, { size: fs3 * 0.85 });
   });
   const edgeW = Math.max(...[b.lo, b.hi].map((v) => g.measure(fmtX(v)).w));
   const every = Math.max(1, Math.ceil((edgeW + 6) / bw));
-  for (let i = 0; i <= n5; i += every) g.text(fmtX(b.lo + i * b.width), f4.left + i * bw, f4.plotBottom + fs2 * 1.35, { align: "center" });
+  for (let i = 0; i <= n5; i += every) g.text(fmtX(b.lo + i * b.width), f4.left + i * bw, f4.plotBottom + fs3 * 1.35, { align: "center" });
   out.push({ t: "line", x1: f4.left, y1: f4.plotBottom, x2: f4.right, y2: f4.plotBottom, stroke: "#9ca3af", strokeWidth: 0.75 });
 }
 function boxStats(sorted) {
@@ -19451,7 +19888,7 @@ function boxStats(sorted) {
   return { min: sorted[0], max: sorted[n5 - 1], q1, med, q3: q32, lo, hi, outliers, mean: sum / n5, n: n5 };
 }
 function paintBoxPlot(g) {
-  const { item, data, out, fs: fs2, pal, lc, who, pointFill, pointLink, fmtV, ctx } = g;
+  const { item, data, out, fs: fs3, pal, lc, who, pointFill, pointLink, fmtV, ctx } = g;
   const s = data.series[0];
   let budget = CAPS.points;
   const stats = data.buckets.map((bk) => {
@@ -19495,13 +19932,13 @@ function paintBoxPlot(g) {
       out.push({ t: "ellipse", cx, cy: f4.vy(v), rx: 2, ry: 2, fill: null, stroke: color2, strokeWidth: 0.9 });
     }
     pointLink(i, { x: cx - f4.band / 2, y: f4.plotTop, w: f4.band, h: f4.plotBottom - f4.plotTop }, `${data.categories[i]}: min ${fmtV(st.lo)}, Q1 ${fmtV(st.q1)}, median ${fmtV(st.med)}, Q3 ${fmtV(st.q3)}, max ${fmtV(st.hi)}${st.outliers.length ? `, ${st.outliers.length} outliers` : ""} (n ${st.n})`);
-    if (g.labelsOn) g.label(fmtV(st.med), cx + bw / 2 + 3, f4.vy(st.med) + fs2 * 0.3, { align: "left", size: fs2 * 0.85 });
+    if (g.labelsOn) g.label(fmtV(st.med), cx + bw / 2 + 3, f4.vy(st.med) + fs3 * 0.3, { align: "left", size: fs3 * 0.85 });
   });
   if (cut) lc.warn(`${who}: more than ${MORE_CAPS.outliers} outliers; the rest are not drawn`);
   out.push({ t: "line", x1: f4.left, y1: f4.plotBottom, x2: f4.right, y2: f4.plotBottom, stroke: "#9ca3af", strokeWidth: 0.75 });
 }
 function paintWaterfall(g) {
-  const { item, data, out, fs: fs2, ctx, lc, who, pointLink, fmtV, anim } = g;
+  const { item, data, out, fs: fs3, ctx, lc, who, pointLink, fmtV, anim } = g;
   const s = data.series[0];
   const up = item.upColor || "#16a34a", down = item.downColor || "#dc2626", tot = item.totalColor || "#2563eb";
   const isTotal = (i) => {
@@ -19547,7 +19984,7 @@ function paintWaterfall(g) {
     const tip = `${b.label}: ${b.kind === "total" ? fmtV(b.v) : `${b.v >= 0 ? "+" : ""}${fmtV(b.v)} → ${fmtV(b.b)}`}`;
     if (b.i >= 0) pointLink(b.i, rect, tip);
     else if (item.tooltips !== false) g.links.push({ t: "link", ...rect, action: null, tip });
-    if (g.labelsOn) g.label(b.kind === "total" ? fmtV(b.v) : `${b.v >= 0 ? "+" : ""}${fmtV(b.v)}`, cx, Math.min(y0, y1) - 3, { size: fs2 * 0.85, alt: { y: Math.max(y0, y1) + fs2, color: g.ink } });
+    if (g.labelsOn) g.label(b.kind === "total" ? fmtV(b.v) : `${b.v >= 0 ? "+" : ""}${fmtV(b.v)}`, cx, Math.min(y0, y1) - 3, { size: fs3 * 0.85, alt: { y: Math.max(y0, y1) + fs3, color: g.ink } });
   });
   out.push({ t: "line", x1: f4.left, y1: f4.vy(0), x2: f4.right, y2: f4.vy(0), stroke: "#9ca3af", strokeWidth: 0.75 });
 }
@@ -19611,7 +20048,7 @@ function step2(d, n5, u) {
   else d.setUTCFullYear(d.getUTCFullYear() + n5);
 }
 function paintGantt(g) {
-  const { item, data, out, X, W: W2, top, bottom, fs: fs2, ctx, lc, who, pal, pointFill, pointLink, axes, grid, text: text2, anim } = g;
+  const { item, data, out, X, W: W2, top, bottom, fs: fs3, ctx, lc, who, pal, pointFill, pointLink, axes, grid, text: text2, anim } = g;
   const cats = data.categories;
   if (!item.ganttStart || !item.ganttEnd) {
     text2("Set the start and end of the bars", X + W2 / 2, (top + bottom) / 2, { align: "center", color: "#9ca3af" });
@@ -19671,18 +20108,18 @@ function paintGantt(g) {
   }
   const catW = Math.min(cats.reduce((m, s) => Math.max(m, g.measure(s).w), 10), W2 * 0.32);
   const plotLeft = X + 4 + catW + 6, plotRight = X + W2 - 6;
-  const plotTop = top + fs2 * 0.6, plotBottom = bottom - fs2 * 1.8 - (xs.title ? fs2 * 1.6 : 0);
+  const plotTop = top + fs3 * 0.6, plotBottom = bottom - fs3 * 1.8 - (xs.title ? fs3 * 1.6 : 0);
   const px = (t) => plotLeft + (t - lo) / (hi - lo) * (plotRight - plotLeft);
   for (const t of ticks) {
     if (t < lo || t > hi) continue;
     if (xs.gridlines !== false) out.push({ t: "line", x1: px(t), y1: plotTop, x2: px(t), y2: plotBottom, stroke: grid, strokeWidth: 0.5 });
-    text2(fmtT(t), px(t), plotBottom + fs2 * 1.35, { align: "center" });
+    text2(fmtT(t), px(t), plotBottom + fs3 * 1.35, { align: "center" });
   }
   if (xs.title) text2(xs.title, (plotLeft + plotRight) / 2, bottom - 2, { align: "center", color: "#6b7280" });
   const lane = (plotBottom - plotTop) / Math.max(1, cats.length);
-  const every = Math.max(1, Math.ceil(fs2 * 1.2 / lane));
+  const every = Math.max(1, Math.ceil(fs3 * 1.2 / lane));
   cats.forEach((s, i) => {
-    if (i % every === 0) text2(s, plotLeft - 5, plotTop + lane * (i + 0.5) + fs2 * 0.35, { align: "right", maxW: catW });
+    if (i % every === 0) text2(s, plotLeft - 5, plotTop + lane * (i + 0.5) + fs3 * 0.35, { align: "right", maxW: catW });
   });
   const bh = Math.max(1, Math.min(lane * 0.62, 22));
   bars.forEach((b, k) => {
@@ -19691,13 +20128,13 @@ function paintGantt(g) {
     const fill3 = groups.keyOf.get(b.r)?.color || pointFill(b.ci, pal[0]);
     out.push({ t: "rect", x: x0, y, w: Math.max(1, x1 - x0), h: bh, fill: fill3, radius: Math.min(2, bh / 4), ...anim ? { anim: { k: anim === "grow" ? "growX" : "fade", o: "left", i: k } } : {} });
     pointLink(b.ci, { x: x0, y, w: Math.max(4, x1 - x0), h: bh }, `${cats[b.ci]}: ${fmtT(b.a)} – ${fmtT(b.b)}`);
-    if (g.labelsOn) g.label(cats[b.ci], x1 + 3, y + bh / 2 + fs2 * 0.3, { align: "left", size: fs2 * 0.85 });
+    if (g.labelsOn) g.label(cats[b.ci], x1 + 3, y + bh / 2 + fs3 * 0.3, { align: "left", size: fs3 * 0.85 });
   });
   out.push({ t: "line", x1: plotLeft, y1: plotBottom, x2: plotRight, y2: plotBottom, stroke: "#9ca3af", strokeWidth: 0.75 });
   if (today != null && today >= lo && today <= hi) {
     const tx = px(today);
     out.push({ t: "line", x1: tx, y1: plotTop, x2: tx, y2: plotBottom, stroke: item.todayColor || "#dc2626", strokeWidth: 1, dash: [3, 2] });
-    text2("Today", tx + 2, plotTop + fs2 * 0.9, { color: item.todayColor || "#dc2626", size: fs2 * 0.85 });
+    text2("Today", tx + 2, plotTop + fs3 * 0.9, { color: item.todayColor || "#dc2626", size: fs3 * 0.85 });
   }
 }
 
@@ -19829,18 +20266,18 @@ function paintChart(item, ctx, lc, base, meta = {}) {
   const m = lc.m;
   const font = resolveFontKey(base.fontFamily, "normal", "normal");
   const bold = resolveFontKey(base.fontFamily, "bold", "normal");
-  const fs2 = Math.max(6, Number(item.fontSize) || 7.5);
+  const fs3 = Math.max(6, Number(item.fontSize) || 7.5);
   const ink = item.textColor || "#374151";
   const grid = "#e5e7eb";
   const X = item.x, W2 = item.w, H = item.h;
   const who = item.name || "Chart";
   const out = [];
-  const measure = (s, { size = fs2, f: fk2 = font, maxW = 9999 } = {}) => {
+  const measure = (s, { size = fs3, f: fk2 = font, maxW = 9999 } = {}) => {
     let str = String(s).slice(0, 200);
     if (m.width(str, fk2, size) > maxW) str = m.ellipsize(str, fk2, size, maxW);
     return { str, w: m.width(str, fk2, size) };
   };
-  const text2 = (s, x, y, { size = fs2, f: fk2 = font, color: color2 = ink, align = "left", maxW = 9999, rotate = null } = {}) => {
+  const text2 = (s, x, y, { size = fs3, f: fk2 = font, color: color2 = ink, align = "left", maxW = 9999, rotate = null } = {}) => {
     const { str, w } = measure(s, { size, f: fk2, maxW });
     const lx = align === "right" ? x - w : align === "center" ? x - w / 2 : x;
     const t = { t: "text", font: fk2, size, color: color2, lines: [{ x: lx, y, text: str, w }] };
@@ -19878,19 +20315,19 @@ function paintChart(item, ctx, lc, base, meta = {}) {
   let top = 4, bottom = H - 4;
   const title2 = item.title ? String(safe2(item.title, ctx, lc, who) ?? "") : "";
   if (title2) {
-    const tw = W2 - 8, full = fs2 * 1.35, s = String(title2).slice(0, 200);
-    const fit = m.width(s, bold, full) <= tw ? full : Math.max(fs2, Math.floor(full * tw / m.width(s, bold, full) * 10) / 10);
+    const tw = W2 - 8, full = fs3 * 1.35, s = String(title2).slice(0, 200);
+    const fit = m.width(s, bold, full) <= tw ? full : Math.max(fs3, Math.floor(full * tw / m.width(s, bold, full) * 10) / 10);
     if (m.width(s, bold, fit) <= tw) {
-      text2(s, X + 4, top + fs2 * 1.4, { size: fit, f: bold, color: "#111827", maxW: tw });
-      top += fs2 * 2.1;
+      text2(s, X + 4, top + fs3 * 1.4, { size: fit, f: bold, color: "#111827", maxW: tw });
+      top += fs3 * 2.1;
     } else {
       const words = s.split(/\s+/);
       let first = "";
-      while (words.length && m.width(first ? `${first} ${words[0]}` : words[0], bold, fs2) <= tw) first = first ? `${first} ${words.shift()}` : words.shift();
+      while (words.length && m.width(first ? `${first} ${words[0]}` : words[0], bold, fs3) <= tw) first = first ? `${first} ${words.shift()}` : words.shift();
       if (!first) first = words.shift() || "";
-      text2(first, X + 4, top + fs2 * 1.4, { size: fs2, f: bold, color: "#111827", maxW: tw });
-      if (words.length) text2(words.join(" "), X + 4, top + fs2 * 2.6, { size: fs2, f: bold, color: "#111827", maxW: tw });
-      top += fs2 * (words.length ? 3.3 : 2.1);
+      text2(first, X + 4, top + fs3 * 1.4, { size: fs3, f: bold, color: "#111827", maxW: tw });
+      if (words.length) text2(words.join(" "), X + 4, top + fs3 * 2.6, { size: fs3, f: bold, color: "#111827", maxW: tw });
+      top += fs3 * (words.length ? 3.3 : 2.1);
     }
   }
   const byCategory = type === "pie" || type === "donut" || type === "funnel";
@@ -19903,7 +20340,7 @@ function paintChart(item, ctx, lc, base, meta = {}) {
     let line3 = [], lw = 0;
     for (const li of legendItems.slice(0, 200)) {
       const key = li.mark ? 14 : 10;
-      const w = key + m.width(String(li.name).slice(0, 200), font, fs2) + 12;
+      const w = key + m.width(String(li.name).slice(0, 200), font, fs3) + 12;
       if (lw + w > W2 - 8 && line3.length) {
         rowsL.push(line3);
         line3 = [];
@@ -19913,16 +20350,16 @@ function paintChart(item, ctx, lc, base, meta = {}) {
       lw += w;
     }
     if (line3.length) rowsL.push(line3);
-    const lh = fs2 * 1.6;
+    const lh = fs3 * 1.6;
     const keep = rowsL.slice(0, Math.max(1, Math.floor((bottom - top) / 2 / lh)));
     bottom -= keep.length * lh;
     keep.forEach((ln, ri) => {
       let lx = X + (W2 - ln.reduce((s, l) => s + l.w, 0)) / 2;
       const ly = bottom + ri * lh + lh * 0.75;
       for (const l of ln) {
-        if (l.mark === "line") out.push({ t: "line", x1: lx, y1: ly - fs2 * 0.35, x2: lx + 11, y2: ly - fs2 * 0.35, stroke: l.color, strokeWidth: 1.4, ...l.dash ? { dash: [3, 2] } : {} });
-        else if (l.mark === "band") out.push({ t: "rect", x: lx, y: ly - fs2 * 0.75, w: 11, h: 7, fill: l.color + "40", stroke: l.color, strokeWidth: 0.5, radius: 1.5 });
-        else out.push({ t: "rect", x: lx, y: ly - fs2 * 0.75, w: 7, h: 7, fill: l.color, radius: 1.5 });
+        if (l.mark === "line") out.push({ t: "line", x1: lx, y1: ly - fs3 * 0.35, x2: lx + 11, y2: ly - fs3 * 0.35, stroke: l.color, strokeWidth: 1.4, ...l.dash ? { dash: [3, 2] } : {} });
+        else if (l.mark === "band") out.push({ t: "rect", x: lx, y: ly - fs3 * 0.75, w: 11, h: 7, fill: l.color + "40", stroke: l.color, strokeWidth: 0.5, radius: 1.5 });
+        else out.push({ t: "rect", x: lx, y: ly - fs3 * 0.75, w: 7, h: 7, fill: l.color, radius: 1.5 });
         text2(l.name, lx + l.key, ly, { maxW: l.w - l.key });
         lx += l.w;
       }
@@ -19937,7 +20374,7 @@ function paintChart(item, ctx, lc, base, meta = {}) {
   const fmtV = (v) => toText(v, axes.y?.format || item.valueFormat || "N0", ctx);
   const anim = item.animation === "grow" || item.animation === "fade" ? item.animation : null;
   const placer = new LabelPlacer({ x: X, y: 0, w: W2, h: H });
-  const label = (s, x, y, { size = fs2 * 0.9, align = "center", color: color2 = ink, f: fk2 = font, alt: alt2 = null } = {}) => {
+  const label = (s, x, y, { size = fs3 * 0.9, align = "center", color: color2 = ink, f: fk2 = font, alt: alt2 = null } = {}) => {
     const { str, w } = measure(s, { size, f: fk2 });
     if (!str.trim()) return false;
     const tries = [{ x, y, align, color: color2 }];
@@ -19960,7 +20397,7 @@ function paintChart(item, ctx, lc, base, meta = {}) {
     return String(tpl).slice(0, 500).replace(/\{(\w+)\}/g, (all, k) => Object.hasOwn(vars, k.toLowerCase()) ? vars[k.toLowerCase()] : all);
   };
   const inLegend = (o) => legendOn && o.legend !== false;
-  const g = { inLegend, item, ctx, lc, data, out, links, X, W: W2, H, top, bottom, fs: fs2, font, bold, ink, grid, text: text2, measure, fmtV, pointFill, pointLink, pointCtx, pal, label, labelsOn, labelText, anim, who, axes, safe: safe2, valueAxis };
+  const g = { inLegend, item, ctx, lc, data, out, links, X, W: W2, H, top, bottom, fs: fs3, font, bold, ink, grid, text: text2, measure, fmtV, pointFill, pointLink, pointCtx, pal, label, labelsOn, labelText, anim, who, axes, safe: safe2, valueAxis };
   if (MORE_TYPES.has(type)) paintMore(type, g);
   else if (ROUND_TYPES.has(type)) paintRound(type, g);
   else if (PER_ROW.has(type)) paintXY(type, g);
@@ -20005,7 +20442,7 @@ var stepDecimals = (step3) => {
   const m = /\.(\d+)$/.exec(t);
   return t.includes("e-") ? Math.min(6, Number(t.split("e-")[1])) : m ? Math.min(6, m[1].length) : 0;
 };
-function valueAxis(spec, lo, hi, minPos, { includeZero = true, len = 100, fs: fs2 = 7.5, fmt: fmt2, percent = false, pad: pad2 = 0, lc, who, name, autoFmt }) {
+function valueAxis(spec, lo, hi, minPos, { includeZero = true, len = 100, fs: fs3 = 7.5, fmt: fmt2, percent = false, pad: pad2 = 0, lc, who, name, autoFmt }) {
   spec = spec && typeof spec === "object" ? spec : {};
   const smin = numOrNull(spec.min), smax = numOrNull(spec.max);
   if (spec.log) {
@@ -20031,7 +20468,7 @@ function valueAxis(spec, lo, hi, minPos, { includeZero = true, len = 100, fs: fs
     if (smax == null) hi = hi <= 0 && hi + d > 0 ? 0 : hi + d;
     padded = true;
   }
-  const want = len < fs2 * 6 ? 3 : 5;
+  const want = len < fs3 * 6 ? 3 : 5;
   const sc = padded && smin == null && smax == null && (lo >= 0 || hi <= 0) ? niceScaleSpan(lo, hi, want) : niceScale(smin ?? lo, smax ?? hi, want);
   let a = sc.lo, b = sc.hi, ticks;
   if (smin != null || smax != null) {
@@ -20079,7 +20516,7 @@ function overlaysOf(item, lc, who) {
 }
 var CAT_KINDS = /* @__PURE__ */ new Set(["column", "bar", "line", "area"]);
 function paintCartesian(type, g) {
-  const { item, lc, data, out, X, W: W2, top, bottom, fs: fs2, font, text: text2, measure, pointFill, pointLink, label, labelsOn, labelText, anim, who, axes, ink, grid } = g;
+  const { item, lc, data, out, X, W: W2, top, bottom, fs: fs3, font, text: text2, measure, pointFill, pointLink, label, labelsOn, labelText, anim, who, axes, ink, grid } = g;
   const m = lc.m;
   const horiz = type === "bar";
   const financialChart = type === "candlestick" || type === "ohlc";
@@ -20183,18 +20620,18 @@ function paintCartesian(type, g) {
   const angleSet = !horiz ? Math.max(-90, Math.min(90, Number(xSpec.labelAngle) || 0)) : 0;
   const layoutAt = (angle2) => {
     const sin2 = Math.abs(Math.sin(angle2 * Math.PI / 180)), cos2 = Math.abs(Math.cos(angle2 * Math.PI / 180));
-    const catBand2 = angle2 ? Math.min(catW, (bottom - top) * 0.4) * sin2 + fs2 * cos2 + fs2 * 0.8 : fs2 * 1.8;
-    const plotTop2 = top + fs2 * 0.6 + (horiz && hasY2 ? fs2 * 1.6 : 0);
-    const plotBottom2 = bottom - (horiz ? fs2 * 1.6 : catBand2) - (bottomTitle ? fs2 * 1.6 : 0);
-    const opt = { len: horiz ? W2 * 0.6 : plotBottom2 - plotTop2, fs: fs2, lc, who, percent: stackMode === "percent" };
+    const catBand2 = angle2 ? Math.min(catW, (bottom - top) * 0.4) * sin2 + fs3 * cos2 + fs3 * 0.8 : fs3 * 1.8;
+    const plotTop2 = top + fs3 * 0.6 + (horiz && hasY2 ? fs3 * 1.6 : 0);
+    const plotBottom2 = bottom - (horiz ? fs3 * 1.6 : catBand2) - (bottomTitle ? fs3 * 1.6 : 0);
+    const opt = { len: horiz ? W2 * 0.6 : plotBottom2 - plotTop2, fs: fs3, lc, who, percent: stackMode === "percent" };
     const ax2 = [
       valueAxis(ySpec, rng[0].lo, rng[0].hi, rng[0].minPos, { ...opt, includeZero: !rng[0].allFin || !rng[0].any, fmt: fmt1, name: "y", autoFmt: auto(ySpec, item.valueFormat) }),
       valueAxis(y2Spec, rng[1].lo, rng[1].hi, rng[1].minPos, { ...opt, includeZero: !rng[1].allFin, fmt: fmt2, name: "secondary y", autoFmt: auto(y2Spec, ySpec.format, item.valueFormat) })
     ];
-    const valW3 = Math.max(10, ...ax2[0].ticks.map((t) => m.width(ax2[0].fmt(t), font, fs2)));
-    const valW22 = hasY2 ? Math.max(10, ...ax2[1].ticks.map((t) => m.width(ax2[1].fmt(t), font, fs2))) : 0;
-    const left2 = X + 4 + (leftTitle ? fs2 * 1.6 : 0) + (horiz ? Math.min(catW, W2 * 0.32) : valW3) + 6;
-    const right2 = X + W2 - 6 - (!horiz && hasY2 ? valW22 + 6 + (y2Spec.title ? fs2 * 1.6 : 0) : 0);
+    const valW3 = Math.max(10, ...ax2[0].ticks.map((t) => m.width(ax2[0].fmt(t), font, fs3)));
+    const valW22 = hasY2 ? Math.max(10, ...ax2[1].ticks.map((t) => m.width(ax2[1].fmt(t), font, fs3))) : 0;
+    const left2 = X + 4 + (leftTitle ? fs3 * 1.6 : 0) + (horiz ? Math.min(catW, W2 * 0.32) : valW3) + 6;
+    const right2 = X + W2 - 6 - (!horiz && hasY2 ? valW22 + 6 + (y2Spec.title ? fs3 * 1.6 : 0) : 0);
     return { angle: angle2, sin: sin2, cos: cos2, catBand: catBand2, plotTop: plotTop2, plotBottom: plotBottom2, ax: ax2, valW: valW3, valW2: valW22, left: left2, right: right2 };
   };
   let lay = layoutAt(angleSet);
@@ -20206,10 +20643,10 @@ function paintCartesian(type, g) {
   }
   if (bottomTitle) text2(bottomTitle, (left + right) / 2, bottom - 2, { align: "center", color: "#6b7280" });
   const midY = (plotTop + plotBottom) / 2;
-  if (leftTitle) text2(leftTitle, X + 4 + fs2, midY, { align: "center", color: "#6b7280", maxW: plotBottom - plotTop, rotate: { a: -90, cx: X + 4 + fs2, cy: midY } });
+  if (leftTitle) text2(leftTitle, X + 4 + fs3, midY, { align: "center", color: "#6b7280", maxW: plotBottom - plotTop, rotate: { a: -90, cx: X + 4 + fs3, cy: midY } });
   if (hasY2 && y2Spec.title) {
-    if (horiz) text2(y2Spec.title, (left + right) / 2, top + fs2, { align: "center", color: "#6b7280" });
-    else text2(y2Spec.title, X + W2 - 4 - fs2, midY, { align: "center", color: "#6b7280", maxW: plotBottom - plotTop, rotate: { a: 90, cx: X + W2 - 4 - fs2, cy: midY } });
+    if (horiz) text2(y2Spec.title, (left + right) / 2, top + fs3, { align: "center", color: "#6b7280" });
+    else text2(y2Spec.title, X + W2 - 4 - fs3, midY, { align: "center", color: "#6b7280", maxW: plotBottom - plotTop, rotate: { a: 90, cx: X + W2 - 4 - fs3, cy: midY } });
   }
   const vpos = (ai, v) => {
     let fr = ax[ai].frac(v);
@@ -20226,10 +20663,10 @@ function paintCartesian(type, g) {
     const showGrid = ySpec.gridlines !== false;
     if (horiz) {
       if (showGrid) out.push({ t: "line", x1: p, y1: plotTop, x2: p, y2: plotBottom, stroke: grid, strokeWidth: 0.5 });
-      if (i % e1 === 0) text2(ax[0].fmt(t), p, plotBottom + fs2 * 1.3, { align: "center" });
+      if (i % e1 === 0) text2(ax[0].fmt(t), p, plotBottom + fs3 * 1.3, { align: "center" });
     } else {
       if (showGrid) out.push({ t: "line", x1: left, y1: p, x2: right, y2: p, stroke: grid, strokeWidth: 0.5 });
-      text2(ax[0].fmt(t), left - 5, p + fs2 * 0.35, { align: "right" });
+      text2(ax[0].fmt(t), left - 5, p + fs3 * 0.35, { align: "right" });
     }
   });
   if (hasY2) {
@@ -20238,8 +20675,8 @@ function paintCartesian(type, g) {
       const p = vpos(1, t);
       if (y2Spec.gridlines) out.push(horiz ? { t: "line", x1: p, y1: plotTop, x2: p, y2: plotBottom, stroke: grid, strokeWidth: 0.5, dash: [2, 2] } : { t: "line", x1: left, y1: p, x2: right, y2: p, stroke: grid, strokeWidth: 0.5, dash: [2, 2] });
       if (horiz) {
-        if (i % e2 === 0) text2(ax[1].fmt(t), p, plotTop - fs2 * 0.5, { align: "center" });
-      } else text2(ax[1].fmt(t), right + 5, p + fs2 * 0.35);
+        if (i % e2 === 0) text2(ax[1].fmt(t), p, plotTop - fs3 * 0.5, { align: "center" });
+      } else text2(ax[1].fmt(t), right + 5, p + fs3 * 0.35);
     });
   }
   const span = horiz ? plotBottom - plotTop : right - left;
@@ -20258,25 +20695,25 @@ function paintCartesian(type, g) {
     const p0 = vpos(ai, o.vals[0]), p1 = vpos(ai, o.vals[1]);
     const color2 = typeof o.color === "string" && /^#[0-9a-f]{6}$/i.test(o.color) ? o.color : "#f59e0b";
     out.push(horiz ? { t: "rect", x: Math.min(p0, p1), y: plotTop, w: Math.abs(p1 - p0), h: plotBottom - plotTop, fill: color2 + "26" } : { t: "rect", x: left, y: Math.min(p0, p1), w: right - left, h: Math.abs(p1 - p0), fill: color2 + "26" });
-    if (o.label && !g.inLegend(o)) text2(String(o.label), horiz ? Math.max(p0, p1) - 2 : right - 2, horiz ? plotTop + fs2 : Math.min(p0, p1) + fs2 * 1.1, { align: "right", color: "#92400e", size: fs2 * 0.9 });
+    if (o.label && !g.inLegend(o)) text2(String(o.label), horiz ? Math.max(p0, p1) - 2 : right - 2, horiz ? plotTop + fs3 : Math.min(p0, p1) + fs3 * 1.1, { align: "right", color: "#92400e", size: fs3 * 0.9 });
   }
   const zero = vpos(0, baseOf(0));
   out.push(horiz ? { t: "line", x1: zero, y1: plotTop, x2: zero, y2: plotBottom, stroke: "#9ca3af", strokeWidth: 0.75 } : { t: "line", x1: left, y1: zero, x2: right, y2: zero, stroke: "#9ca3af", strokeWidth: 0.75 });
   if (angle) {
-    const every = Math.max(1, Math.ceil(fs2 * 1.2 / Math.max(band * sin, 0.01)));
-    const maxW = Math.max(10, (catBand - fs2 * cos - fs2 * 0.8) / Math.max(sin, 0.01));
+    const every = Math.max(1, Math.ceil(fs3 * 1.2 / Math.max(band * sin, 0.01)));
+    const maxW = Math.max(10, (catBand - fs3 * cos - fs3 * 0.8) / Math.max(sin, 0.01));
     data.categories.forEach((c, i) => {
       if (i % every) return;
-      const cx = center(i), cy = plotBottom + fs2 * 0.6;
-      text2(c, cx, cy + fs2 * 0.35 * cos, { align: angle < 0 ? "right" : "left", maxW, rotate: { a: angle, cx, cy } });
+      const cx = center(i), cy = plotBottom + fs3 * 0.6;
+      text2(c, cx, cy + fs3 * 0.35 * cos, { align: angle < 0 ? "right" : "left", maxW, rotate: { a: angle, cx, cy } });
     });
     if (every > 1) lc.warn(`${who}: ${n5 - Math.ceil(n5 / every)} of ${n5} category labels do not fit even turned, so they are not shown (every bar is drawn)`);
   } else {
-    const every = Math.max(1, Math.ceil((horiz ? fs2 * 1.3 : catW + 6) / band));
+    const every = Math.max(1, Math.ceil((horiz ? fs3 * 1.3 : catW + 6) / band));
     data.categories.forEach((c, i) => {
       if (i % every) return;
-      if (horiz) text2(c, left - 5, center(i) + fs2 * 0.35, { align: "right", maxW: left - X - 8 - (leftTitle ? fs2 * 1.6 : 0) });
-      else text2(c, center(i), plotBottom + fs2 * 1.35, { align: "center", maxW: band * every - 2 });
+      if (horiz) text2(c, left - 5, center(i) + fs3 * 0.35, { align: "right", maxW: left - X - 8 - (leftTitle ? fs3 * 1.6 : 0) });
+      else text2(c, center(i), plotBottom + fs3 * 1.35, { align: "center", maxW: band * every - 2 });
     });
     if (every > 1) lc.warn(`${who}: ${n5 - Math.ceil(n5 / every)} of ${n5} category labels do not fit, so they are not shown (every bar is drawn)`);
   }
@@ -20336,7 +20773,7 @@ function paintCartesian(type, g) {
         pointLink(ci, horiz ? { x: Math.min(ph, pl2) - 2, y: c - band / 2, w: Math.abs(ph - pl2) + 4, h: band } : { x: c - band / 2, y: Math.min(ph, pl2) - 2, w: band, h: Math.abs(ph - pl2) + 4 }, tipOf(r, ci, p));
         if (labelsOn) {
           const q3 = P(c, ph);
-          if (horiz) label(labelText(ci, s, p.v), q3.x + 3, q3.y + fs2 * 0.35, { align: "left" });
+          if (horiz) label(labelText(ci, s, p.v), q3.x + 3, q3.y + fs3 * 0.35, { align: "left" });
           else label(labelText(ci, s, p.v), q3.x, q3.y - 3);
         }
       });
@@ -20354,14 +20791,14 @@ function paintCartesian(type, g) {
         if (!labelsOn) return;
         const str = labelText(ci, s, p.v, p.pct ?? share(r, p.v));
         const where = pos === "inside" || pos === "center" || pos === "outside" ? pos : r.stacks ? "center" : "outside";
-        const sz = fs2 * 0.9;
+        const sz = fs3 * 0.9;
         const color2 = where === "outside" ? ink : inkOn(fill3);
         const back = horiz ? p1 < p0 : p1 > p0;
         if (where === "center") label(str, rect.x + rect.w / 2, rect.y + rect.h / 2 + sz * 0.35, { color: color2, size: sz });
         else if (where === "inside") {
           if (horiz) label(str, back ? rect.x + 3 : rect.x + rect.w - 3, rect.y + rect.h / 2 + sz * 0.35, { align: back ? "left" : "right", color: color2, size: sz });
           else label(str, rect.x + rect.w / 2, back ? rect.y + rect.h - 3 : rect.y + sz + 2, { color: color2, size: sz });
-        } else if (horiz) label(str, Math.max(p0, p1) + 3, rect.y + rect.h / 2 + fs2 * 0.35, { align: "left", size: sz, alt: { x: Math.max(p0, p1) - 3, align: "right", color: inkOn(fill3) } });
+        } else if (horiz) label(str, Math.max(p0, p1) + 3, rect.y + rect.h / 2 + fs3 * 0.35, { align: "left", size: sz, alt: { x: Math.max(p0, p1) - 3, align: "right", color: inkOn(fill3) } });
         else label(str, rect.x + rect.w / 2, Math.min(p0, p1) - 3, { size: sz, alt: { y: Math.min(p0, p1) + sz + 2, color: inkOn(fill3) } });
       });
       continue;
@@ -20388,7 +20825,7 @@ function paintCartesian(type, g) {
     for (const q3 of pts2) pointLink(q3.ci, horiz ? { x: left, y: q3.y - band / 2, w: right - left, h: band } : { x: q3.x - band / 2, y: plotTop, w: band, h: plotBottom - plotTop }, tipOf(r, q3.ci, q3.p));
     if (labelsOn) for (const q3 of pts2) {
       const str = labelText(q3.ci, s, q3.v, q3.p.pct ?? share(r, q3.v));
-      const sz = fs2 * 0.85;
+      const sz = fs3 * 0.85;
       if (horiz) label(str, q3.x + 4, q3.y - 3, { align: "left", size: sz, alt: q3.y + sz + 3 });
       else if (pos === "center" || pos === "inside") label(str, q3.x, q3.y + sz * 0.35, { size: sz });
       else label(str, q3.x, q3.y - 4, { size: sz, alt: q3.y + sz + 4 });
@@ -20404,8 +20841,8 @@ function paintCartesian(type, g) {
         out.push(horiz ? { t: "line", x1: p, y1: plotTop, x2: p, y2: plotBottom, stroke: color2, strokeWidth: 1, dash: [4, 3] } : { t: "line", x1: left, y1: p, x2: right, y2: p, stroke: color2, strokeWidth: 1, dash: [4, 3] });
         if (o.label) {
           const s = `${o.label}${o.showValue === false ? "" : ` ${ax[ai2].fmt(v)}`}`;
-          if (horiz) text2(s, p + 2, plotTop + fs2, { color: color2, size: fs2 * 0.9 });
-          else text2(s, right - 2, p - 2.5, { align: "right", color: color2, size: fs2 * 0.9 });
+          if (horiz) text2(s, p + 2, plotTop + fs3, { color: color2, size: fs3 * 0.9 });
+          else text2(s, right - 2, p - 2.5, { align: "right", color: color2, size: fs3 * 0.9 });
         }
       }
       continue;
@@ -20438,16 +20875,16 @@ function paintCartesian(type, g) {
     out.push({ t: "path", x: 0, y: 0, d: curvePath(pts2, "straight"), fill: null, stroke: color2, strokeWidth: 1.2, ...o.type === "trend" ? { dash: [4, 3] } : {} });
     if (o.label && !g.inLegend(o)) {
       const e2 = pts2[pts2.length - 1];
-      if (horiz) text2(String(o.label), e2.x + 3, e2.y + fs2 * 0.35, { color: color2, size: fs2 * 0.9 });
-      else text2(String(o.label), Math.min(e2.x, right) - 2, e2.y - 4, { align: "right", color: color2, size: fs2 * 0.9 });
+      if (horiz) text2(String(o.label), e2.x + 3, e2.y + fs3 * 0.35, { color: color2, size: fs3 * 0.9 });
+      else text2(String(o.label), Math.min(e2.x, right) - 2, e2.y - 4, { align: "right", color: color2, size: fs3 * 0.9 });
     }
   }
 }
 function robustWindow(vals) {
   const s = vals.filter(Number.isFinite).sort((a, b) => a - b);
   if (s.length < 2) return null;
-  const at2 = (q3) => s[Math.min(s.length - 1, Math.floor(q3 * (s.length - 1)))];
-  const p1 = at2(0.01), p99 = at2(0.99);
+  const at3 = (q3) => s[Math.min(s.length - 1, Math.floor(q3 * (s.length - 1)))];
+  const p1 = at3(0.01), p99 = at3(0.99);
   return { p1, p99, extreme: p99 > p1 && s[s.length - 1] - s[0] > 5 * (p99 - p1) };
 }
 function rowPoints(type, g) {
@@ -20484,7 +20921,7 @@ function rowPoints(type, g) {
   return sets;
 }
 function paintXY(type, g) {
-  const { item, ctx, lc, out, X, W: W2, top, bottom, fs: fs2, font, text: text2, label, labelsOn, axes, who, grid, anim } = g;
+  const { item, ctx, lc, out, X, W: W2, top, bottom, fs: fs3, font, text: text2, label, labelsOn, axes, who, grid, anim } = g;
   const sets = rowPoints(type, g);
   g.xy = sets;
   if (!sets.some((x) => x.pts.length)) {
@@ -20527,11 +20964,11 @@ function paintXY(type, g) {
     ylo = clipY.lo;
     yhi = clipY.hi;
   }
-  const ay = valueAxis(ys, ylo, yhi, ymp, { includeZero: false, pad: 0.05, len: bottom - top, fs: fs2, fmt: fmtY, lc, who, name: "y" });
-  const axx = valueAxis(xs, xlo, xhi, xmp, { includeZero: false, pad: 0.05, len: W2, fs: fs2, fmt: fmtX, lc, who, name: "x" });
+  const ay = valueAxis(ys, ylo, yhi, ymp, { includeZero: false, pad: 0.05, len: bottom - top, fs: fs3, fmt: fmtY, lc, who, name: "y" });
+  const axx = valueAxis(xs, xlo, xhi, xmp, { includeZero: false, pad: 0.05, len: W2, fs: fs3, fmt: fmtX, lc, who, name: "x" });
   const leftTitle = ys.title, bottomTitle = xs.title || item.xTitle;
-  const left = X + 10 + (leftTitle ? fs2 * 1.6 : 0) + Math.max(...ay.ticks.map((t) => lc.m.width(fmtY(t), font, fs2)));
-  const right = X + W2 - 6, pb = bottom - fs2 * 1.8 - (bottomTitle ? fs2 * 1.6 : 0), pt = top + fs2 * 0.6;
+  const left = X + 10 + (leftTitle ? fs3 * 1.6 : 0) + Math.max(...ay.ticks.map((t) => lc.m.width(fmtY(t), font, fs3)));
+  const right = X + W2 - 6, pb = bottom - fs3 * 1.8 - (bottomTitle ? fs3 * 1.6 : 0), pt = top + fs3 * 0.6;
   const maxR = Math.max(4, Math.min(right - left, pb - pt) / 12);
   const ins = type === "bubble" ? maxR : 0;
   const clamp2 = (v) => Math.max(0, Math.min(1, v ?? 0));
@@ -20544,16 +20981,16 @@ function paintXY(type, g) {
     return ys.reversed ? pt + ins + fr * (pb - pt - 2 * ins) : pb - ins - fr * (pb - pt - 2 * ins);
   };
   if (bottomTitle) text2(bottomTitle, (left + right) / 2, bottom - 2, { align: "center", color: "#6b7280" });
-  if (leftTitle) text2(leftTitle, X + 4 + fs2, (pt + pb) / 2, { align: "center", color: "#6b7280", rotate: { a: -90, cx: X + 4 + fs2, cy: (pt + pb) / 2 } });
+  if (leftTitle) text2(leftTitle, X + 4 + fs3, (pt + pb) / 2, { align: "center", color: "#6b7280", rotate: { a: -90, cx: X + 4 + fs3, cy: (pt + pb) / 2 } });
   for (const t of ay.ticks) {
     if (ys.gridlines !== false) out.push({ t: "line", x1: left, y1: py(t), x2: right, y2: py(t), stroke: grid, strokeWidth: 0.5 });
-    text2(fmtY(t), left - 5, py(t) + fs2 * 0.35, { align: "right" });
+    text2(fmtY(t), left - 5, py(t) + fs3 * 0.35, { align: "right" });
   }
-  const tw = Math.max(...axx.ticks.map((t) => lc.m.width(fmtX(t), font, fs2)));
+  const tw = Math.max(...axx.ticks.map((t) => lc.m.width(fmtX(t), font, fs3)));
   const every = Math.max(1, Math.ceil((tw + 6) / (Math.abs(right - left) / Math.max(1, axx.ticks.length - 1))));
   axx.ticks.forEach((t, i) => {
     if (xs.gridlines) out.push({ t: "line", x1: px(t), y1: pt, x2: px(t), y2: pb, stroke: grid, strokeWidth: 0.5 });
-    if (i % every === 0) text2(fmtX(t), px(t), pb + fs2 * 1.35, { align: "center" });
+    if (i % every === 0) text2(fmtX(t), px(t), pb + fs3 * 1.35, { align: "center" });
   });
   out.push({ t: "line", x1: left, y1: pb, x2: right, y2: pb, stroke: "#9ca3af", strokeWidth: 0.75 });
   const overlays = overlaysOf(item, lc, who);
@@ -20572,11 +21009,11 @@ function paintXY(type, g) {
       out.push(tag2(e2, anim && { k: anim === "grow" ? "scale" : "fade", i: j }));
       const isClipped = clipped && beyond(p) || pastAxis(p);
       if (isClipped) out.push({ t: "ellipse", cx: e2.cx, cy: e2.cy, rx: r + 1.6, ry: r + 1.6, fill: "none", stroke: col3, strokeWidth: 0.9 });
-      if (item.tooltips !== false && (type === "bubble" || multi || isClipped)) g.links.push({ t: "link", x: e2.cx - r, y: e2.cy - r, w: r * 2, h: r * 2, action: null, tip: `${multi ? `${s.name}: ` : ""}${fmtX(p.x)}, ${fmtY(p.y)}${type === "bubble" ? ` (${toText(p.size, null, ctx)})` : ""}${isClipped ? clipped && beyond(p) ? " (outlier, drawn at the edge)" : " (outside the axis range you set, draw\
-n at the edge)" : ""}` });
+      if (item.tooltips !== false && (type === "bubble" || multi || isClipped)) g.links.push({ t: "link", x: e2.cx - r, y: e2.cy - r, w: r * 2, h: r * 2, action: null, tip: `${multi ? `${s.name}: ` : ""}${fmtX(p.x)}, ${fmtY(p.y)}${type === "bubble" ? ` (${toText(p.size, null, ctx)})` : ""}${isClipped ? clipped && beyond(p) ? " (outlier, drawn at the edge)" : (" (outside the axis range you set, draw"+
+"n at the edge)") : ""}` });
       if (labelsOn) {
         const str = item.labelTemplate ? String(item.labelTemplate).slice(0, 500).replace(/\{(\w+)\}/g, (all, k) => ({ value: fmtY(p.y), x: fmtX(p.x), series: s.name, size: toText(p.size, null, ctx) })[k.toLowerCase()] ?? all) : fmtY(p.y);
-        label(str, e2.cx, e2.cy - r - 2, { size: fs2 * 0.85 });
+        label(str, e2.cx, e2.cy - r - 2, { size: fs3 * 0.85 });
       }
     });
   }
@@ -20585,7 +21022,7 @@ n at the edge)" : ""}` });
     if (o.type === "line") {
       for (const v of overlayValues(o, g)) {
         out.push({ t: "line", x1: left, y1: py(v), x2: right, y2: py(v), stroke: color2, strokeWidth: 1, dash: [4, 3] });
-        if (o.label) text2(`${o.label} ${fmtY(v)}`, right - 2, py(v) - 2.5, { align: "right", color: color2, size: fs2 * 0.9 });
+        if (o.label) text2(`${o.label} ${fmtY(v)}`, right - 2, py(v) - 2.5, { align: "right", color: color2, size: fs3 * 0.9 });
       }
     } else if (o.type === "trend") {
       const set = sets[Math.max(0, Math.min(sets.length - 1, Math.floor(Number(o.series)) || 0))];
@@ -20604,24 +21041,24 @@ n at the edge)" : ""}` });
       }
       if (pts2.length > 1) {
         out.push({ t: "path", x: 0, y: 0, d: curvePath(pts2, "straight"), fill: null, stroke: color2, strokeWidth: 1.2, dash: [4, 3] });
-        if (o.label && !g.inLegend(o)) text2(String(o.label), pts2[pts2.length - 1].x - 2, pts2[pts2.length - 1].y - 4, { align: "right", color: color2, size: fs2 * 0.9 });
+        if (o.label && !g.inLegend(o)) text2(String(o.label), pts2[pts2.length - 1].x - 2, pts2[pts2.length - 1].y - 4, { align: "right", color: color2, size: fs3 * 0.9 });
       }
     }
   }
 }
 function paintPolar(g, sets) {
-  const { item, ctx, out, X, W: W2, top, bottom, fs: fs2, text: text2, grid, axes, lc, who, anim } = g;
+  const { item, ctx, out, X, W: W2, top, bottom, fs: fs3, text: text2, grid, axes, lc, who, anim } = g;
   const cx = X + W2 / 2, cy = (top + bottom) / 2;
-  const R2 = Math.max(6, Math.min(W2, bottom - top) / 2 - fs2 * 2);
+  const R2 = Math.max(6, Math.min(W2, bottom - top) / 2 - fs3 * 2);
   let hi = 0, lo = 0;
   for (const st of sets) for (const p of st.pts) {
     hi = Math.max(hi, p.y);
     lo = Math.min(lo, p.y);
   }
   const fmtY = (v) => toText(v, axes.y?.format || item.valueFormat || "N0", ctx);
-  const ay = valueAxis(axes.y, lo, hi, Infinity, { includeZero: true, len: R2 * 2, fs: fs2, fmt: fmtY, lc, who, name: "radius" });
+  const ay = valueAxis(axes.y, lo, hi, Infinity, { includeZero: true, len: R2 * 2, fs: fs3, fmt: fmtY, lc, who, name: "radius" });
   const rad = (v) => Math.max(0, Math.min(1, ay.frac(v) ?? 0)) * R2;
-  const at2 = (deg, r) => {
+  const at3 = (deg, r) => {
     const a = (deg - 90) * Math.PI / 180;
     return { x: cx + Math.cos(a) * r, y: cy + Math.sin(a) * r };
   };
@@ -20630,13 +21067,13 @@ function paintPolar(g, sets) {
     if (r > 0) out.push({ t: "ellipse", cx, cy, rx: r, ry: r, fill: null, stroke: grid, strokeWidth: 0.5 });
   }
   for (let d = 0; d < 360; d += 45) {
-    const e2 = at2(d, R2), l = at2(d, R2 + fs2 * 0.9);
+    const e2 = at3(d, R2), l = at3(d, R2 + fs3 * 0.9);
     out.push({ t: "line", x1: cx, y1: cy, x2: e2.x, y2: e2.y, stroke: grid, strokeWidth: 0.5 });
-    text2(`${d}°`, l.x, l.y + fs2 * 0.35, { align: Math.abs(l.x - cx) < 1 ? "center" : l.x > cx ? "left" : "right", size: fs2 * 0.85, color: "#6b7280" });
+    text2(`${d}°`, l.x, l.y + fs3 * 0.35, { align: Math.abs(l.x - cx) < 1 ? "center" : l.x > cx ? "left" : "right", size: fs3 * 0.85, color: "#6b7280" });
   }
-  for (const t of ay.ticks) if (rad(t) > 0 && rad(t) < R2 - 0.5) text2(fmtY(t), cx + 3, cy - rad(t) + fs2 * 0.3, { size: fs2 * 0.8, color: "#6b7280" });
+  for (const t of ay.ticks) if (rad(t) > 0 && rad(t) < R2 - 0.5) text2(fmtY(t), cx + 3, cy - rad(t) + fs3 * 0.3, { size: fs3 * 0.8, color: "#6b7280" });
   for (const { s, pts: pts2, i } of sets) {
-    const q3 = pts2.map((p) => ({ ...at2(p.x, rad(p.y)), p }));
+    const q3 = pts2.map((p) => ({ ...at3(p.x, rad(p.y)), p }));
     if (s.def.type === "line" || s.def.type === "area") {
       const deg = (e2) => (e2.p.x % 360 + 360) % 360;
       const sorted = [...q3].sort((a, b) => deg(a) - deg(b));
@@ -21341,14 +21778,14 @@ function paintMap(item, ctx, lc, base) {
   }
   const out = [];
   const font = resolveFontKey(base.fontFamily, "normal", "normal");
-  const fs2 = Math.max(6, Number(item.fontSize) || 7);
+  const fs3 = Math.max(6, Number(item.fontSize) || 7);
   const text2 = (s, x, y, align = "left") => {
-    const str = String(s), w = lc.m.width(str, font, fs2);
-    out.push({ t: "text", font, size: fs2, color: "#374151", lines: [{ x: align === "right" ? x - w : x, y, text: str, w }] });
+    const str = String(s), w = lc.m.width(str, font, fs3);
+    out.push({ t: "text", font, size: fs3, color: "#374151", lines: [{ x: align === "right" ? x - w : x, y, text: str, w }] });
   };
   const pts2 = [...shapes.flatMap((s) => s.polys.flat(2)), ...lines.flatMap((l) => l.lines.flat(1)), ...points.map((p) => [p.lon, p.lat])].map(([lon, lat]) => project(lon, lat));
   if (!pts2.length) {
-    text2("No shapes or points to draw", item.x + 4, fs2 + 4);
+    text2("No shapes or points to draw", item.x + 4, fs3 + 4);
     return out;
   }
   const showLegend = item.legend !== "none" && values.size > 0;
@@ -21414,14 +21851,14 @@ function paintMap(item, ctx, lc, base) {
     const [cx, cy] = toXY(p.lon, p.lat);
     const r = p.size != null && maxSize > 0 ? Math.max(1, maxR * Math.sqrt(Math.max(0, p.size) / maxSize)) : 3;
     out.push({ t: "ellipse", cx, cy, rx: r, ry: r, fill: item.pointColor || "#dc2626", stroke: "#ffffff", strokeWidth: 0.5 });
-    if (p.label != null && p.label !== "") text2(p.label, cx + r + 2, cy + fs2 / 3);
+    if (p.label != null && p.label !== "") text2(p.label, cx + r + 2, cy + fs3 / 3);
   }
   if (showLegend) {
     const ly = H + 4;
     if (nk) {
       const step3 = (hi - lo) / nk;
       const labels = Array.from({ length: nk }, (_, i) => `${fmt2(lo + step3 * i)} – ${fmt2(i === nk - 1 ? hi : lo + step3 * (i + 1))}`);
-      const ws = labels.map((s) => 10 + lc.m.width(s, font, fs2) + 8);
+      const ws = labels.map((s) => 10 + lc.m.width(s, font, fs3) + 8);
       let lx = item.x + Math.max(0, (W2 - ws.reduce((a, b) => a + b, 0)) / 2);
       labels.forEach((s, i) => {
         out.push({ t: "rect", x: lx, y: ly, w: 8, h: 8, fill: mix(low, high, i / (nk - 1)) });
@@ -22335,10 +22772,10 @@ function buildTree(groups, rows, ctx, lc, who, axis, state) {
     }
     const seen = /* @__PURE__ */ new Set(), late = [];
     let deep = false;
-    const visit = (x, d, path2) => {
+    const visit = (x, d, path3) => {
       seen.add(x);
       x.depth = d;
-      x.path = `${path2}/${x.text}`;
+      x.path = `${path3}/${x.text}`;
       let all = x.rows;
       const kids = [];
       for (const c of x.rec || []) {
@@ -22436,7 +22873,7 @@ function visible(root, groups) {
     for (let p = n5; p && p.level >= 0; p = p.parent) c.unshift(p);
     return c;
   };
-  const walk = (n5, l) => {
+  const walk2 = (n5, l) => {
     const g = groups[l];
     const total = { kind: "total", node: n5, level: l, chain: chainOf(n5) };
     if (g.total === "before") out.push(total);
@@ -22451,11 +22888,11 @@ function visible(root, groups) {
     for (const c of n5.children || []) {
       if (l === groups.length - 1) leaf(c);
       else if (!c.open) out.push({ kind: "collapsed", node: c, level: l, chain: chainOf(c) });
-      else walk(c, l + 1);
+      else walk2(c, l + 1);
     }
     if (g.total === "after") out.push(total);
   };
-  walk(root, 0);
+  walk2(root, 0);
   return out;
 }
 function spans(entries) {
@@ -22710,10 +23147,10 @@ function sliceColumns(o) {
   if (k >= 2) {
     const base = Math.floor(blocks.length / k), extra = blocks.length % k;
     const even = [];
-    let at2 = 0;
+    let at3 = 0;
     for (let p = 0; p < k; p++) {
-      const part2 = blocks.slice(at2, at2 + base + (p < extra ? 1 : 0));
-      at2 += part2.length;
+      const part2 = blocks.slice(at3, at3 + base + (p < extra ? 1 : 0));
+      at3 += part2.length;
       even.push({ from: part2[0].from, to: part2[part2.length - 1].to, w: part2.reduce((s, b) => s + b.w, 0) });
     }
     if (even.every((s) => s.w <= avail + EPS)) sets = even;
@@ -22842,16 +23279,16 @@ function sliceColumns(o) {
 function rowCells(cells, ncols) {
   const list2 = Array.isArray(cells) ? cells : [];
   const span = (c) => Math.max(1, Math.floor(Number(c?.colSpan)) || 1);
-  const at2 = new Array(ncols).fill(null);
+  const at3 = new Array(ncols).fill(null);
   const covered = [];
   if (list2.length < ncols && list2.some((c) => span(c) > 1)) {
     let pos = 0;
     for (const c of list2) {
       if (pos >= ncols) break;
-      at2[pos] = c ?? null;
+      at3[pos] = c ?? null;
       pos += span(c);
     }
-    return { at: at2, covered };
+    return { at: at3, covered };
   }
   let until = -1, by = -1;
   for (let k = 0; k < Math.min(list2.length, ncols); k++) {
@@ -22860,13 +23297,13 @@ function rowCells(cells, ncols) {
       if (c) covered.push([k, by]);
       continue;
     }
-    at2[k] = c ?? null;
+    at3[k] = c ?? null;
     if (span(c) > 1) {
       until = k + span(c) - 1;
       by = k;
     }
   }
-  return { at: at2, covered };
+  return { at: at3, covered };
 }
 
 // src/engine/items/index.js
@@ -22930,20 +23367,20 @@ function paintTextbox(item, lc, ctx, forcedH) {
   const size0 = Number(st.fontSize) || 9;
   const shrink = (min, fits, step3) => {
     const steps = Number.isFinite(size0) ? Math.max(0, Math.floor((size0 - min) / step3 + 1e-9)) : 0;
-    const at2 = (i) => {
+    const at3 = (i) => {
       const s2 = { ...st, fontSize: Math.max(min, size0 - step3 * (i + 1)) };
       return { s2, t2: layoutTextLines(text2, s2, layoutW, lc.m) };
     };
     let lo = 0, hi = steps - 1, best = null;
     while (lo <= hi) {
       const mid = Math.floor((lo + hi) / 2);
-      const c = at2(mid);
+      const c = at3(mid);
       if (fits(c.t2)) {
         best = c;
         hi = mid - 1;
       } else lo = mid + 1;
     }
-    return { best, last: steps > 0 ? () => at2(steps - 1) : null };
+    return { best, last: steps > 0 ? () => at3(steps - 1) : null };
   };
   const fitsBox = (t) => t.needed <= layoutH + GROW_TOLERANCE;
   if (item.shrinkToFit && !fitsBox(tl)) {
@@ -23182,9 +23619,9 @@ function fitColumns(item, cols, rows, tctx, lc) {
   const nat = cols.map(() => 0);
   const measure = (row, ctx) => {
     const rst = resolveStyle([lc.base, lc.named?.[item.styleName], item.style, row.style], ctx);
-    const { at: at2 } = rowCells(row.cells, cols.length);
+    const { at: at3 } = rowCells(row.cells, cols.length);
     for (let ci = 0; ci < cols.length; ci++) {
-      const cell = at2[ci];
+      const cell = at3[ci];
       if (!auto[ci] || !cell || (cell.colSpan || 1) > 1 || cell.item) continue;
       let v;
       try {
@@ -23314,10 +23751,10 @@ register("table", {
       const cells = [];
       let started = null;
       let need = row.height || 18;
-      let at2 = cellsAt.get(row);
-      if (!at2) cellsAt.set(row, at2 = rowCells(row.cells, cols.length).at);
+      let at3 = cellsAt.get(row);
+      if (!at3) cellsAt.set(row, at3 = rowCells(row.cells, cols.length).at);
       for (let ci = 0; ci < cols.length; ci++) {
-        const cell = at2[ci];
+        const cell = at3[ci];
         if (!cell || covered(ci)) continue;
         const span = Math.max(1, Math.min(cell.colSpan || 1, cols.length - ci));
         let cw = 0;
@@ -23494,8 +23931,8 @@ register("table", {
           cellLinks(add2, s, u.height, kind, s.level);
           if (s.toggle) add2.push(toggleLink(s, s.w, u.height));
         }
-        const at2 = u.items.findIndex((it) => itemLeft(it) >= s.x + s.w - 0.01);
-        u.items.splice(at2 < 0 ? u.items.length : at2, 0, ...add2);
+        const at3 = u.items.findIndex((it) => itemLeft(it) >= s.x + s.w - 0.01);
+        u.items.splice(at3 < 0 ? u.items.length : at3, 0, ...add2);
       });
       if (s.tl.needed > s.units[0].height + GROW_TOLERANCE || s.st.verticalAlign && s.st.verticalAlign !== "top") {
         const id = `${item.name || item.type}:span:${lc.nextId()}`;
@@ -23633,8 +24070,8 @@ register("table", {
           gctx.level = depth;
           if (g.indent) gctx.indent = (ctx.indent || 0) + depth * Number(g.indent);
         }
-        const path2 = `${parentPath}/${bk.text}`;
-        const tkey = `${item.name || item.type}|${level}|${path2}`;
+        const path3 = `${parentPath}/${bk.text}`;
+        const tkey = `${item.name || item.type}|${level}|${path3}`;
         const dflt = kids && g.expandLevels != null ? depth < Number(g.expandLevels) : !g.initiallyCollapsed;
         const open = !g.collapsible ? true : lc.state?.toggles?.[tkey] ?? dflt;
         const start = units.length;
@@ -23655,9 +24092,9 @@ register("table", {
         if (rep) gctx.__rep = rep;
         const ch = kids?.get(bk) || [];
         if (open) {
-          emit2(level + 1, bk.rows, gctx, [...chain, sc], path2);
+          emit2(level + 1, bk.rows, gctx, [...chain, sc], path3);
           if (ch.length && depth + 1 >= MAX_TREE_DEPTH) lc.warn(`${item.name || item.type}: the group "${gname}" is more than ${MAX_TREE_DEPTH} levels deep; deeper rows are listed at the top level`);
-          else ch.forEach((c, ci) => node3(c, ci, ch, depth + 1, path2));
+          else ch.forEach((c, ci) => node3(c, ci, ch, depth + 1, path3));
         } else {
           const rs = recOf.get(bk) || bk.rows;
           for (const s of [...chain, sc]) {
@@ -23685,7 +24122,7 @@ register("table", {
           if (g.newSection) units[start].sectionStart = true;
           if (g.pageBreak === "after" && bi < sibs.length - 1) units[units.length - 1].breakAfter = true;
           if (g.keepTogether) {
-            const id = `${item.name || item.type}:g${level}:${path2}:${lc.nextId()}`;
+            const id = `${item.name || item.type}:g${level}:${path3}:${lc.nextId()}`;
             for (let k = start; k < units.length; k++) if (!units[k].block) {
               units[k].block = id;
               if (cont) units[k].blockOpen = true;
@@ -27189,14 +27626,14 @@ var REPORT_SCHEMA = {
       "additionalProperties": true
     },
     "Report": {
-      "description": "A ReportWright report definition (pagewright/report@1).",
+      "description": "A ReportWright report definition (reportwright/report@1).",
       "type": "object",
       "properties": {
         "$schema": {
-          "description": "pagewright/report@1; reportwright/report@1 is the same format under the new name.",
+          "description": "reportwright/report@1; pagewright/report@1 (deprecated, the name before the rename) is the same format.",
           "enum": [
-            "pagewright/report@1",
-            "reportwright/report@1"
+            "reportwright/report@1",
+            "pagewright/report@1"
           ]
         },
         "name": {
@@ -27314,7 +27751,7 @@ var REPORT_SCHEMA = {
       ],
       "examples": [
         {
-          "$schema": "pagewright/report@1",
+          "$schema": "reportwright/report@1",
           "name": "Invoice",
           "page": {
             "size": "A4",
@@ -27432,11 +27869,11 @@ var REPORT_SCHEMA = {
 // src/engine/schema/validate.js
 init_format();
 init_units();
-var SCHEMA_ID = "pagewright/report@1";
-var SCHEMA_ALIAS = "reportwright/report@1";
-var ITEM_KEYS = new Set("id type name x y w h style styleName items hidden layer locked label alt value dataSet canGrow canShrink action bookmark tooltip keepTogether pageBreakBefore pageBreakAfter pageBreakBetween newSection filters sort groups groupBy groupAdjacent inheritRows columns header detail footer repeatHeader widowControl noRowsText pageBreakEvery cells rows rowGroup rowGroups columnGro\
-up columnGroups values value valueFormat rowSort columnSort rowTotals columnTotals cellStyle headerStyle totalStyle corner partProps library part properties overflow overflowTo src fit headingLevel rotate shrinkToFit minFontSize shrinkStep tocDots tocLink tocPage format chartType series seriesGroup category title legend palette stacked valueAxis xTitle maxCategories outliers categorySort categoryF\
-ormat showValues labelPosition symbology quietZone report params text toggle initiallyCollapsed collapsible expandLevels repeatColumns columnGap rowHeaderWidth anim animation visual comment notes description".split(" "));
+var SCHEMA_ID = "reportwright/report@1";
+var SCHEMA_ALIAS = "pagewright/report@1";
+var ITEM_KEYS = new Set(("id type name x y w h style styleName items hidden layer locked label alt value dataSet canGrow canShrink action bookmark tooltip keepTogether pageBreakBefore pageBreakAfter pageBreakBetween newSection filters sort groups groupBy groupAdjacent inheritRows columns header detail footer repeatHeader widowControl noRowsText pageBreakEvery cells rows rowGroup rowGroups columnGro"+
+"up columnGroups values value valueFormat rowSort columnSort rowTotals columnTotals cellStyle headerStyle totalStyle corner partProps library part properties overflow overflowTo src fit headingLevel rotate shrinkToFit minFontSize shrinkStep tocDots tocLink tocPage format chartType series seriesGroup category title legend palette stacked valueAxis xTitle maxCategories outliers categorySort categoryF"+
+"ormat showValues labelPosition symbology quietZone report params text toggle initiallyCollapsed collapsible expandLevels repeatColumns columnGap rowHeaderWidth anim animation visual comment notes description").split(" "));
 var NO_SERIES_CHARTS = /* @__PURE__ */ new Set(["gantt"]);
 function looksLikeLink(it) {
   if (it.type !== "textbox" || it.action && it.action.type && it.action.type !== "none") return false;
@@ -27447,8 +27884,8 @@ function looksLikeLink(it) {
   const [r, g, b] = m.slice(1).map((h) => parseInt(h, 16));
   return b > 150 && b > r + 60 && b > g + 30;
 }
-var DEF_KEYS = new Set("$schema name description locale currency timeZone page parameters dataSources dataSets styles sections functions layers images theme themeDef master nullPropagation caseSensitive naturalSort nullOrder collation arithmetic bandRows version id tags author folder stylesheet parts partProperties dashboard comment notes customCode libraries liveParameters parameterLayout drafts \
-history nonFinite".split(" "));
+var DEF_KEYS = new Set(("$schema name description locale currency timeZone page parameters dataSources dataSets styles sections functions layers images theme themeDef master nullPropagation caseSensitive naturalSort nullOrder collation arithmetic bandRows version id tags author folder stylesheet parts partProperties dashboard comment notes customCode libraries liveParameters parameterLayout drafts "+
+"history nonFinite").split(" "));
 for (const k of Object.keys(REPORT_SCHEMA.$defs.Report.properties)) DEF_KEYS.add(k);
 var lev = (a, b) => {
   if (Math.abs(a.length - b.length) > 2) return 3;
@@ -27498,17 +27935,29 @@ function formatIssue(f4, label, out) {
 }
 function sortIssues(sort, label, out) {
   sort.forEach((s, i) => {
-    const at2 = `${label}, sort ${i + 1}`;
+    const at3 = `${label}, sort ${i + 1}`;
     if (!s || typeof s !== "object" || Array.isArray(s) || !("by" in s)) {
-      out.push(`${at2}: a sort entry is {by, dir}, e.g. {"by": "=Fields.Name", "dir": "asc"}; this one has no "by" and is ignored`);
+      out.push(`${at3}: a sort entry is {by, dir}, e.g. {"by": "=Fields.Name", "dir": "asc"}; this one has no "by" and is ignored`);
       return;
     }
     for (const k of Object.keys(s)) {
       if (k === "by" || k === "dir" || k.startsWith("_")) continue;
       const g = SORT_ALIAS[k] || didYouMean(k, ["by", "dir"]);
-      out.push(`${at2}: "${k}" is ignored; a sort entry is {by, dir}${g ? ` (did you mean "${g}"?)` : ""}`);
+      out.push(`${at3}: "${k}" is ignored; a sort entry is {by, dir}${g ? ` (did you mean "${g}"?)` : ""}`);
+    }
+    if (s.dir != null && !["asc", "desc"].includes(s.dir)) out.push(`${at3}: "dir" is ${JSON.stringify(s.dir)}; expected "asc" or "desc"`);
+  });
+}
+var FILTER_KEYS = ["expr", "op", "value", "value2", "skipBlank"];
+var FILTER_ALIAS = { expression: "expr", field: "expr", by: "expr", operator: "op", comparison: "op", values: "value", value1: "value" };
+function filterIssues(filters, label, out) {
+  filters.forEach((f4, i) => {
+    if (!f4 || typeof f4 !== "object" || Array.isArray(f4)) return;
+    for (const k of Object.keys(f4)) {
+      if (FILTER_KEYS.includes(k) || k.startsWith("_")) continue;
+      const g = FILTER_ALIAS[k] || didYouMean(k, FILTER_KEYS);
+      out.push(`${label}, filter ${i + 1}: "${k}" is ignored; a filter is {${FILTER_KEYS.join(", ")}}${g ? ` (did you mean "${g}"?)` : ""}`);
     }
-    if (s.dir != null && !["asc", "desc"].includes(s.dir)) out.push(`${at2}: "dir" is ${JSON.stringify(s.dir)}; expected "asc" or "desc"`);
   });
 }
 var SCHEMA_ITEMS = (() => {
@@ -27593,6 +28042,7 @@ function validate(def) {
     } else if (!srcNames.has(d.source)) errors.push(`Data set "${d.name}" uses the source "${d.source}", which does not exist`);
     dsNames.add(d.name);
     if (Array.isArray(d.sort)) sortIssues(d.sort, `Data set "${d.name}"`, warnings);
+    if (Array.isArray(d.filters)) filterIssues(d.filters, `Data set "${d.name}"`, warnings);
   }
   const names = /* @__PURE__ */ new Set();
   const check = (where, v, label) => {
@@ -27655,6 +28105,7 @@ function validate(def) {
         warnings.push(`${label}: there is no named style "${it.styleName}"${g ? ` (did you mean "${g}"?)` : ""}; it is ignored`);
       }
       if (Array.isArray(it.sort)) sortIssues(it.sort, label, warnings);
+      if (Array.isArray(it.filters)) filterIssues(it.filters, label, warnings);
       if (it.type === "chart" && it.legend != null && it.legend !== "bottom" && it.legend !== "none") {
         const shown2 = typeof it.legend === "object" ? `is an object (${JSON.stringify(it.legend).slice(0, 60)})` : `is ${JSON.stringify(it.legend)}`;
         warnings.push(`${label}: "legend" ${shown2}; only "bottom" (show the legend) or "none" (hide it) is supported, and the legend is drawn at the bottom`);
@@ -28054,15 +28505,15 @@ async function loadParts(def, get, warn, budget) {
     for (const q3 of Array.isArray(p.properties) ? p.properties : []) if (q3?.name) props[q3.name] = q3.default ?? null;
     const inner2 = [];
     let own = 0;
-    const walk = (list2) => {
+    const walk2 = (list2) => {
       for (const x of list2 || []) {
         if (!x || typeof x !== "object") continue;
         own++;
         if (x.type === "part") inner2.push(x);
-        walk(x.items);
+        walk2(x.items);
       }
     };
-    walk([item]);
+    walk2([item]);
     parts.set(key, { item, props, own, inner: inner2.filter((x) => x !== item) });
     libs.set(lib, d);
     for (const x of inner2) {
@@ -28880,20 +29331,20 @@ async function encryptPdf(doc, opt) {
     return cat(iv, await aesCbc(fileKey, iv, bytes));
   };
   const seen = /* @__PURE__ */ new Set();
-  const walk = async (obj) => {
+  const walk2 = async (obj) => {
     if (obj instanceof PDFString || obj instanceof PDFHexString) return PDFHexString.of(hex2(await enc(obj.asBytes())));
     if (obj instanceof PDFArray) {
-      for (let i = 0; i < obj.size(); i++) obj.set(i, await walk(obj.get(i)));
+      for (let i = 0; i < obj.size(); i++) obj.set(i, await walk2(obj.get(i)));
       return obj;
     }
     if (obj instanceof PDFDict) {
       if (seen.has(obj)) return obj;
       seen.add(obj);
-      for (const [k, v] of obj.entries()) obj.set(k, await walk(v));
+      for (const [k, v] of obj.entries()) obj.set(k, await walk2(v));
       return obj;
     }
     if (obj instanceof PDFStream) {
-      await walk(obj.dict);
+      await walk2(obj.dict);
       const contents = obj instanceof PDFRawStream ? obj.contents : (
         /** @type {any} */
         obj.getContents()
@@ -28902,7 +29353,7 @@ async function encryptPdf(doc, opt) {
     }
     return obj;
   };
-  for (const [ref2, obj] of ctx.enumerateIndirectObjects()) ctx.assign(ref2, await walk(obj));
+  for (const [ref2, obj] of ctx.enumerateIndirectObjects()) ctx.assign(ref2, await walk2(obj));
   const encrypt = ctx.obj({
     Filter: "Standard",
     V: 5,
@@ -28997,9 +29448,9 @@ ${pdfa ? `<rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/n
 </x:xmpmeta>
 <?xpacket end="w"?>`;
 }
-var PDFUA_SCHEMA = `<rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"><pdfaExtension:schemas><rdf:Bag><rdf:li rdf:parseType="Resource"><pdfaSchema:schema>PDF/UA identification schema</pdfaSchema:schema><pdfaSchema:namespaceURI>http://www.aiim.or\
-g/pdfua/ns/id/</pdfaSchema:namespaceURI><pdfaSchema:prefix>pdfuaid</pdfaSchema:prefix><pdfaSchema:property><rdf:Seq><rdf:li rdf:parseType="Resource"><pdfaProperty:name>part</pdfaProperty:name><pdfaProperty:valueType>Integer</pdfaProperty:valueType><pdfaProperty:category>internal</pdfaProperty:category><pdfaProperty:description>PDF/UA version identifier</pdfaProperty:description></rdf:li></rdf:Seq>\
-</pdfaSchema:property></rdf:li></rdf:Bag></pdfaExtension:schemas></rdf:Description>
+var PDFUA_SCHEMA = `<rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"><pdfaExtension:schemas><rdf:Bag><rdf:li rdf:parseType="Resource"><pdfaSchema:schema>PDF/UA identification schema</pdfaSchema:schema><pdfaSchema:namespaceURI>http://www.aiim.or${
+""}g/pdfua/ns/id/</pdfaSchema:namespaceURI><pdfaSchema:prefix>pdfuaid</pdfaSchema:prefix><pdfaSchema:property><rdf:Seq><rdf:li rdf:parseType="Resource"><pdfaProperty:name>part</pdfaProperty:name><pdfaProperty:valueType>Integer</pdfaProperty:valueType><pdfaProperty:category>internal</pdfaProperty:category><pdfaProperty:description>PDF/UA version identifier</pdfaProperty:description></rdf:li></rdf:Seq>${
+""}</pdfaSchema:property></rdf:li></rdf:Bag></pdfaExtension:schemas></rdf:Description>
 `;
 function setMetadata(doc, xmp) {
   const ctx = doc.context;
@@ -29176,8 +29627,8 @@ function parseSvg(text2) {
 }
 var clamp01 = (v) => Number.isFinite(v) ? Math.min(1, Math.max(0, v)) : 1;
 var paint = (v) => v === "currentColor" ? "#000" : /^url\(/.test(String(v || "")) ? "none" : v;
-function drawSvg(page, svg, at2) {
-  const place = [at2.sx, 0, 0, -at2.sy, at2.x, at2.y + svg.h * at2.sy];
+function drawSvg(page, svg, at3) {
+  const place = [at3.sx, 0, 0, -at3.sy, at3.x, at3.y + svg.h * at3.sy];
   for (const s of svg.shapes) {
     if (!s.fill && !s.stroke) continue;
     const m = mul(mul(place, s.m), [1, 0, 0, -1, 0, 0]);
@@ -29220,8 +29671,8 @@ function imageHref(src, proxyBase = "") {
   return "";
 }
 var n = (v) => Math.round(v * 100) / 100;
-var ANIM_CSS = "<style>@media (prefers-reduced-motion:no-preference){.pw-a{transform-box:fill-box;animation:pw-fade .55s ease-out both}.pw-a-growY{animation-name:pw-growY}.pw-a-growX{animation-name:pw-growX}.pw-a-scale{animation-name:pw-scale}@keyframes pw-fade{from{opacity:0}}@keyframes pw-growY{from{transform:scaleY(0)}}@keyframes pw-growX{from{transform:scaleX(0)}}@keyframes pw-scale{from{trans\
-form:scale(0);opacity:0}}}</style>";
+var ANIM_CSS = ("<style>@media (prefers-reduced-motion:no-preference){.pw-a{transform-box:fill-box;animation:pw-fade .55s ease-out both}.pw-a-growY{animation-name:pw-growY}.pw-a-growX{animation-name:pw-growX}.pw-a-scale{animation-name:pw-scale}@keyframes pw-fade{from{opacity:0}}@keyframes pw-growY{from{transform:scaleY(0)}}@keyframes pw-growX{from{transform:scaleX(0)}}@keyframes pw-scale{from{trans"+
+"form:scale(0);opacity:0}}}</style>");
 var ANIM_KINDS = /* @__PURE__ */ new Set(["growY", "growX", "scale", "fade"]);
 var ANIM_ORIGIN = { bottom: "center bottom", top: "center top", left: "left center", right: "right center" };
 function pageToSvg(page, w, h, { background = true, animate = false, box = void 0, outline: outline2 = null, proxyBase = "" } = {}) {
@@ -29785,15 +30236,15 @@ function createTagger(model, doc) {
       const refOf = /* @__PURE__ */ new Map();
       const all = [];
       for (const t of root.tables?.values() || []) regular(t);
-      const walk = (n5) => {
+      const walk2 = (n5) => {
         refOf.set(n5, ctx.nextRef());
         all.push(n5);
         for (const k of n5.kids) if (k.S) {
           k.parent ||= n5;
-          walk(k);
+          walk2(k);
         }
       };
-      walk(root);
+      walk2(root);
       const nums2 = [];
       let key = 0;
       pages.forEach((pg, pi) => {
@@ -30200,27 +30651,27 @@ async function* readerIter(rs) {
     r.releaseLock?.();
   }
 }
-function splitPath(path2) {
-  if (!path2 || path2 === "$") return [];
-  const p = path2.startsWith("$") ? path2.slice(1) : "." + path2;
+function splitPath(path3) {
+  if (!path3 || path3 === "$") return [];
+  const p = path3.startsWith("$") ? path3.slice(1) : "." + path3;
   const re = /\.([A-Za-z_$][\w$]*)|\['([^']+)'\]|\["([^"]+)"\]|(\[\*\])$/y;
   const keys = [];
-  let at2 = 0;
-  while (at2 < p.length) {
-    re.lastIndex = at2;
+  let at3 = 0;
+  while (at3 < p.length) {
+    re.lastIndex = at3;
     const m = re.exec(p);
     if (!m) return null;
     if (!m[4]) keys.push(m[1] ?? m[2] ?? m[3]);
-    at2 = re.lastIndex;
+    at3 = re.lastIndex;
   }
   return keys;
 }
-async function* jsonRows(body, path2, { maxElementBytes = 1048576, maxWholeBytes = 64 * 1048576, maxDepth = 512, batch = 1e3 } = {}) {
-  const keys = splitPath(path2);
+async function* jsonRows(body, path3, { maxElementBytes = 1048576, maxWholeBytes = 64 * 1048576, maxDepth = 512, batch = 1e3 } = {}) {
+  const keys = splitPath(path3);
   let whole = keys == null ? "" : null;
   let buf = "", i = 0;
   const stack2 = [];
-  let inStr = false, esc8 = false, strStart = -1;
+  let inStr = false, esc9 = false, strStart = -1;
   let target = -1;
   let elemStart = -1, done = false;
   let out = [], outLen = 0;
@@ -30246,8 +30697,8 @@ async function* jsonRows(body, path2, { maxElementBytes = 1048576, maxWholeBytes
     for (; i < buf.length; i++) {
       const c = buf.charCodeAt(i);
       if (inStr) {
-        if (esc8) esc8 = false;
-        else if (c === 92) esc8 = true;
+        if (esc9) esc9 = false;
+        else if (c === 92) esc9 = true;
         else if (c === 34) {
           inStr = false;
           const top = stack2[stack2.length - 1];
@@ -30329,7 +30780,7 @@ async function* jsonRows(body, path2, { maxElementBytes = 1048576, maxWholeBytes
   }
   if (whole != null) {
     const raw = whole === "" ? null : JSON.parse(whole);
-    let { rows } = jsonPathRows(raw, path2 || "$");
+    let { rows } = jsonPathRows(raw, path3 || "$");
     if (rows == null) rows = [];
     else if (!Array.isArray(rows)) rows = [rows];
     for (let k = 0; k < rows.length; k += batch) yield rows.slice(k, k + batch);
@@ -30594,7 +31045,7 @@ async function planStream(def0, opts) {
   const setCtx = { ...baseCtx, ...ds.caseSensitive != null ? { caseSensitive: ds.caseSensitive === true } : {} };
   const tctx = { ...baseCtx };
   const cellsAt = /* @__PURE__ */ new WeakMap();
-  const at2 = (row) => {
+  const at3 = (row) => {
     let a = cellsAt.get(row);
     if (!a) cellsAt.set(row, a = rowCells(row.cells, ncols).at);
     return a;
@@ -30603,7 +31054,7 @@ async function planStream(def0, opts) {
     if (row.hidden === true) return null;
     const rst = resolveStyle([base, named?.[item.styleName], item.style, named?.[row.styleName], row.style], ctx);
     const cells = [];
-    const a = at2(row);
+    const a = at3(row);
     for (let ci = 0; ci < ncols; ci++) {
       const cell = a[ci];
       if (!cell) continue;
@@ -30709,11 +31160,11 @@ async function planStream(def0, opts) {
       }
       return out;
     };
-    const ready = (fs2) => {
-      fields = seen = fs2;
-      plain2 = plainOf(fs2);
-      calc = fs2.filter((fd) => fd.expr);
-      fopts = new Map(fs2.map((fd) => [fd, optFor(fd)]));
+    const ready = (fs3) => {
+      fields = seen = fs3;
+      plain2 = plainOf(fs3);
+      calc = fs3.filter((fd) => fd.expr);
+      fopts = new Map(fs3.map((fd) => [fd, optFor(fd)]));
       cc = { ...baseCtx, dataSets: {}, fields: null };
     };
     if (fields) ready(fields);
@@ -30807,7 +31258,7 @@ async function planStream(def0, opts) {
       let seq = 0;
       for await (const r of inOrder(true)) {
         gc.fields = r;
-        let path2 = "";
+        let path3 = "";
         const g = [];
         for (let l = 0; l < groups.length; l++) {
           let key;
@@ -30817,12 +31268,12 @@ async function planStream(def0, opts) {
             warn(`${item.name || item.type} group: ${e2.message}`);
             key = "#Error";
           }
-          path2 += `\0${groupKeyText(key, tctx)}`;
-          let p = paths[l].get(path2);
+          path3 += `\0${groupKeyText(key, tctx)}`;
+          let p = paths[l].get(path3);
           if (!p) {
-            keyText += path2.length;
+            keyText += path3.length;
             if (ord > 1e6 || keyText > 64 * 1048576) throw Object.assign(new Error("Too many groups (or group keys too long) to stream: filter the data."), { status: 413, fallBack: true });
-            paths[l].set(path2, p = [ord++, key]);
+            paths[l].set(path3, p = [ord++, key]);
           }
           g.push(p);
         }
@@ -30850,7 +31301,7 @@ async function planStream(def0, opts) {
   const foldCells = (rows2) => {
     const out = [];
     for (const row of rows2 || []) {
-      const a = at2(row);
+      const a = at3(row);
       for (let ci = 0; ci < ncols; ci++) {
         const f4 = a[ci] && foldOf(a[ci].value);
         if (f4) out.push({ row, ci, ...f4 });
@@ -30972,8 +31423,8 @@ async function planStream(def0, opts) {
   }
   return { name: item.name, columns: cols.map((c) => c.width), title: def.name || "", timeZone: timeZone || null, locale: def.locale || null, currency: def.currency || null, warnings, rows, records: inOrder, grouped: displayOrder, fieldList, stats };
 }
-function listAt(raw, path2) {
-  let { rows } = jsonPathRows(raw, path2 || "$");
+function listAt(raw, path3) {
+  let { rows } = jsonPathRows(raw, path3 || "$");
   if (rows == null) rows = [];
   return Array.isArray(rows) ? rows : [rows];
 }
@@ -31059,7 +31510,7 @@ async function planPaged(def0, opts = {}) {
     if (!fields.length) return no2("undeclared fields (no rows to detect them from)");
     ds = { ...ds, fields };
   }
-  const strip = (fields) => fields.map(({ expr, path: path2, ...f4 }) => f4);
+  const strip = (fields) => fields.map(({ expr, path: path3, ...f4 }) => f4);
   const windowDef = (first, last, done) => {
     const t = { ...gtable, sort: void 0, filters: void 0 };
     if (!last) delete t.footer;
@@ -31093,11 +31544,11 @@ async function planPaged(def0, opts = {}) {
     []
   ), pages: 0 };
   const L = groups.length;
-  const newAcc = (fs2) => fs2.map((f4) => f4.fn === "countrows" ? { n: 0 } : { agg: aggregator(f4.fn, fctx), err: null });
+  const newAcc = (fs3) => fs3.map((f4) => f4.fn === "countrows" ? { n: 0 } : { agg: aggregator(f4.fn, fctx), err: null });
   const value = (a) => a.n ?? (a.err ? "#Error" : a.agg.value());
-  const addTo = (fs2, acc, r) => {
+  const addTo = (fs3, acc, r) => {
     fctx.fields = r;
-    fs2.forEach((f4, i) => {
+    fs3.forEach((f4, i) => {
       const a = acc[i];
       if (a.n != null) a.n++;
       else if (!a.err) {
@@ -31229,7 +31680,7 @@ async function planPaged(def0, opts = {}) {
         const m = await render(job.def, { ...opts, exportData: !!(opts.exportData || opts.tagged), sources: { __rows: { rows: job.rows } }, pageWindow: job.pageWindow });
         return { pages: m.pages, count: m.pages.length, nextFirst: m.pages[job.keep]?.firstRow, bookmarks: m.bookmarks, headings: m.headings, warnings: m.warnings };
       };
-      const run = o.run || local, at2 = o.run ? 2 * Math.max(1, Number(o.parallel) || 1) : 1;
+      const run = o.run || local, at3 = o.run ? 2 * Math.max(1, Number(o.parallel) || 1) : 1;
       const queue = (
         /** @type {any[]} */
         []
@@ -31282,7 +31733,7 @@ async function planPaged(def0, opts = {}) {
         res.catch(() => {
         });
         queue.push({ job, res });
-        if (queue.length >= at2) {
+        if (queue.length >= at3) {
           const q3 = queue.shift();
           yield* handOut(q3.job, await q3.res);
         }
@@ -32143,10 +32594,10 @@ function createPdfStream(sink, opt) {
   const flush = async () => {
     if (!size) return;
     const all = new Uint8Array(size);
-    let at2 = 0;
+    let at3 = 0;
     for (const p of parts) {
-      all.set(p, at2);
-      at2 += p.length;
+      all.set(p, at3);
+      at3 += p.length;
     }
     parts = [];
     size = 0;
@@ -32446,10 +32897,10 @@ endobj
               row[6] = i & 255;
             }
           }
-          const at2 = (n5 - from) * 8;
-          rows[at2] = 2;
+          const at3 = (n5 - from) * 8;
+          rows[at3] = 2;
           for (let b = 0; b < 7; b++) {
-            rows[at2 + 1 + b] = row[b] - prev[b] & 255;
+            rows[at3 + 1 + b] = row[b] - prev[b] & 255;
             prev[b] = row[b];
           }
         }
@@ -33427,10 +33878,10 @@ async function ownWriter(model, fontStore2, opt) {
     } }
   );
   const out = new Uint8Array(parts.reduce((n5, p) => n5 + p.length, 0));
-  let at2 = 0;
+  let at3 = 0;
   for (const p of parts) {
-    out.set(p, at2);
-    at2 += p.length;
+    out.set(p, at3);
+    at3 += p.length;
   }
   return out;
 }
@@ -33486,7 +33937,7 @@ function plainEncoding(pf) {
     return w * size / f4.unitsPerEm;
   };
   const lit2 = /* @__PURE__ */ new Map();
-  const esc8 = (b) => b === 40 || b === 41 || b === 92 ? "\\" + String.fromCharCode(b) : b === 13 ? "\\r" : String.fromCharCode(b);
+  const esc9 = (b) => b === 40 || b === 41 || b === 92 ? "\\" + String.fromCharCode(b) : b === 13 ? "\\r" : String.fromCharCode(b);
   e2.tjOf = (text2) => {
     let out = "", cur = "", any = false;
     for (const ch of text2) {
@@ -33515,7 +33966,7 @@ function plainEncoding(pf) {
       let b = lit2.get(cp);
       if (b === void 0) {
         const id = f4.glyphForCodePoint(cp).id;
-        lit2.set(cp, b = esc8(id >> 8) + esc8(id & 255));
+        lit2.set(cp, b = esc9(id >> 8) + esc9(id & 255));
       }
       out += b;
     }
@@ -33624,24 +34075,24 @@ var usedKB = () => {
 var live = /* @__PURE__ */ new Set();
 var hooked = false;
 var sweep = () => {
-  const fs2 = node2("node:fs");
+  const fs3 = node2("node:fs");
   for (const d of live) {
     try {
-      fs2.rmSync(d, { recursive: true, force: true });
+      fs3.rmSync(d, { recursive: true, force: true });
     } catch {
     }
   }
   live.clear();
 };
 function sweepStale(root, staleMs) {
-  const fs2 = node2("node:fs"), path2 = node2("node:path");
+  const fs3 = node2("node:fs"), path3 = node2("node:path");
   try {
-    for (const n5 of fs2.readdirSync(root)) {
+    for (const n5 of fs3.readdirSync(root)) {
       if (!n5.startsWith("pw-spill-")) continue;
-      const d = path2.join(root, n5);
+      const d = path3.join(root, n5);
       if (live.has(d)) continue;
       try {
-        if (Date.now() - fs2.statSync(d).mtimeMs > staleMs) fs2.rmSync(d, { recursive: true, force: true });
+        if (Date.now() - fs3.statSync(d).mtimeMs > staleMs) fs3.rmSync(d, { recursive: true, force: true });
       } catch {
       }
     }
@@ -33650,9 +34101,9 @@ function sweepStale(root, staleMs) {
 }
 var MB = 1048576;
 function spillSorter({ runMB = 8, mergeMB = 4, run = 1e4, runBytes = runMB * MB, frame: frame3 = 200, maxMB = 2048, totalMB = 8192, dir: root = node2("node:os").tmpdir(), staleMs = 18e4 } = {}) {
-  const fs2 = node2("node:fs"), path2 = node2("node:path"), v8 = node2("node:v8"), { threadId } = node2("node:worker_threads");
+  const fs3 = node2("node:fs"), path3 = node2("node:path"), v8 = node2("node:v8"), { threadId } = node2("node:worker_threads");
   try {
-    fs2.accessSync(root, fs2.constants.W_OK);
+    fs3.accessSync(root, fs3.constants.W_OK);
   } catch {
     throw Object.assign(new Error(`spill.dir "${root}" does not exist or is not writable`), { status: 400 });
   }
@@ -33671,15 +34122,15 @@ function spillSorter({ runMB = 8, mergeMB = 4, run = 1e4, runBytes = runMB * MB,
     };
     const writeRun = async (batches) => {
       if (!dir) {
-        dir = fs2.mkdtempSync(path2.join(root, `pw-spill-${process.pid}-${threadId}-`));
+        dir = fs3.mkdtempSync(path3.join(root, `pw-spill-${process.pid}-${threadId}-`));
         live.add(dir);
         if (!hooked) {
           hooked = true;
           process.once("exit", sweep);
         }
       }
-      const file = path2.join(dir, `run-${made++}`);
-      const fh = await fs2.promises.open(file, "wx", 384);
+      const file = path3.join(dir, `run-${made++}`);
+      const fh = await fs3.promises.open(file, "wx", 384);
       let size = 0;
       sizes.set(file, 0);
       try {
@@ -33808,7 +34259,7 @@ function spillSorter({ runMB = 8, mergeMB = 4, run = 1e4, runBytes = runMB * MB,
           for (const f4 of group2) {
             onDisk -= sizes.get(f4) || 0;
             sizes.delete(f4);
-            await fs2.promises.rm(f4, { force: true });
+            await fs3.promises.rm(f4, { force: true });
           }
           account();
           passes++;
@@ -33826,7 +34277,7 @@ function spillSorter({ runMB = 8, mergeMB = 4, run = 1e4, runBytes = runMB * MB,
           const d = dir;
           dir = null;
           live.delete(d);
-          await fs2.promises.rm(d, { recursive: true, force: true }).catch(() => {
+          await fs3.promises.rm(d, { recursive: true, force: true }).catch(() => {
           });
         }
       },
@@ -33848,8 +34299,8 @@ function approx(x, d = 0) {
   return n5;
 }
 async function openRun(file) {
-  const fs2 = node2("node:fs"), v8 = node2("node:v8");
-  const fh = await fs2.promises.open(file, "r");
+  const fs3 = node2("node:fs"), v8 = node2("node:v8");
+  const fh = await fs3.promises.open(file, "r");
   let pos = 0, batch = [], i = 0;
   const head = Buffer.alloc(4);
   return {
@@ -33954,7 +34405,7 @@ function setNameStrings(name, strings) {
   o.setUint16(0, 0);
   o.setUint16(2, count);
   o.setUint16(4, 6 + 12 * count);
-  let at2 = 6 + 12 * count;
+  let at3 = 6 + 12 * count;
   recs.forEach((r, i) => {
     const p = 6 + 12 * i;
     o.setUint16(p, r.platform);
@@ -33962,9 +34413,9 @@ function setNameStrings(name, strings) {
     o.setUint16(p + 4, r.lang);
     o.setUint16(p + 6, r.id);
     o.setUint16(p + 8, r.raw.length);
-    o.setUint16(p + 10, at2 - (6 + 12 * count));
-    out.set(r.raw, at2);
-    at2 += r.raw.length;
+    o.setUint16(p + 10, at3 - (6 + 12 * count));
+    out.set(r.raw, at3);
+    at3 += r.raw.length;
   });
   return out;
 }
@@ -34304,7 +34755,7 @@ async function htmlOf(model, fontStore2, opt) {
     }
     faces.push(`@font-face{font-family:"${fontFamilyCss(key)}";src:url(data:font/ttf;base64,${b642(bytes)}) format("truetype")}`);
   }
-  const esc8 = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;");
+  const esc9 = (s) => String(s).replace(/&/g, "&amp;").replace(/</g, "&lt;");
   const anchors = /* @__PURE__ */ new Map();
   const jumpTo = (a) => {
     const to = a.page ? a : model.bookmarks?.find((b) => b.label === a.target) || model.headings?.find((b) => b.label === a.target);
@@ -34337,7 +34788,7 @@ async function htmlOf(model, fontStore2, opt) {
     } catch {
     }
     if (t && "href" in t) return `<a href="${attr(t.href)}"${t.external ? ' target="_blank" rel="noopener"' : ""}><rect${a}/>${ttl}</a>`;
-    if (t && "off" in t) return `<g class="pw-off"><rect${a}/><title>${esc8(t.off)}</title></g>`;
+    if (t && "off" in t) return `<g class="pw-off"><rect${a}/><title>${esc9(t.off)}</title></g>`;
     return `<rect${a}/>`;
   }));
   const pages = model.pages.map((p, i) => {
@@ -34353,7 +34804,7 @@ async function htmlOf(model, fontStore2, opt) {
   const lang = opt.lang && /^[A-Za-z]{2,3}(-[A-Za-z0-9]{2,8})*$/.test(opt.lang) ? opt.lang : "en";
   return `<!doctype html>
 <html lang="${data ? lang : "en"}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
-${csp}<title>${esc8(opt.title || model.name || "Report")}</title>
+${csp}<title>${esc9(opt.title || model.name || "Report")}</title>
 <style>
 ${faces.join("\n")}
 html{background:#e6eaee}body{margin:0;padding:24px 12px;display:flex;flex-direction:column;align-items:center;gap:18px;font-family:system-ui,sans-serif}
@@ -34362,7 +34813,7 @@ html{background:#e6eaee}body{margin:0;padding:24px 12px;display:flex;flex-direct
 .page svg{display:block;width:100%;height:auto}
 @media print{html{background:#fff}body{padding:0;gap:0}.page{box-shadow:none;width:100%;break-after:page}@page{size:${model.width}pt ${model.height}pt;margin:0}}
 ${data ? DATA_CSS + "\n" : ""}</style></head><body>
-${data ? `<nav class="pw-bar" id="pw-bar" hidden><button type="button" data-view="pages" aria-pressed="true">${esc8(S3.pages)}</button><button type="button" data-view="tables" aria-pressed="false">${esc8(S3.tables)}</button></nav>
+${data ? `<nav class="pw-bar" id="pw-bar" hidden><button type="button" data-view="pages" aria-pressed="true">${esc9(S3.pages)}</button><button type="button" data-view="tables" aria-pressed="false">${esc9(S3.tables)}</button></nav>
 ` : ""}${pages}
 ${data ? `<div id="pw-tables" hidden></div>
 <script type="application/json" id="pw-data">${JSON.stringify({ tables: data, strings: S3 }).replace(/</g, "\\u003c")}</script>
@@ -34522,8 +34973,8 @@ function chartXml(spec, sheet) {
     const per = t === "bubble" ? 3 : 2;
     const body = spec.series.map((s, i) => {
       const c = 1 + i * per, n5 = s.x.length;
-      return `<c:ser><c:idx val="${i}"/><c:order val="${i}"/><c:tx><c:strRef><c:f>${ref(sheet, c + 1, 1, c + 1, 1)}</c:f>${strCache([s.name])}</c:strRef></c:tx>${t === "bubble" ? fill(s.color) : `<c:spPr><a:ln w="19050"><a:noFill/></a:ln></c:spPr><c:marker><c:symbol val="circle"/><c:size val="5"/>${fill(s.color)}</c:marker>`}<c:xVal><c:numRef><c:f>${ref(sheet, c, 2, c, n5 + 1)}</c:f>${numCache(s.x)}\
-</c:numRef></c:xVal><c:yVal><c:numRef><c:f>${ref(sheet, c + 1, 2, c + 1, n5 + 1)}</c:f>${numCache(s.y, fmt2)}</c:numRef></c:yVal>` + (t === "bubble" ? `<c:bubbleSize><c:numRef><c:f>${ref(sheet, c + 2, 2, c + 2, n5 + 1)}</c:f>${numCache(s.size || [])}</c:numRef></c:bubbleSize><c:bubble3D val="0"/>` : '<c:smooth val="0"/>') + "</c:ser>";
+      return `<c:ser><c:idx val="${i}"/><c:order val="${i}"/><c:tx><c:strRef><c:f>${ref(sheet, c + 1, 1, c + 1, 1)}</c:f>${strCache([s.name])}</c:strRef></c:tx>${t === "bubble" ? fill(s.color) : `<c:spPr><a:ln w="19050"><a:noFill/></a:ln></c:spPr><c:marker><c:symbol val="circle"/><c:size val="5"/>${fill(s.color)}</c:marker>`}<c:xVal><c:numRef><c:f>${ref(sheet, c, 2, c, n5 + 1)}</c:f>${numCache(s.x)}${
+""}</c:numRef></c:xVal><c:yVal><c:numRef><c:f>${ref(sheet, c + 1, 2, c + 1, n5 + 1)}</c:f>${numCache(s.y, fmt2)}</c:numRef></c:yVal>` + (t === "bubble" ? `<c:bubbleSize><c:numRef><c:f>${ref(sheet, c + 2, 2, c + 2, n5 + 1)}</c:f>${numCache(s.size || [])}</c:numRef></c:bubbleSize><c:bubble3D val="0"/>` : '<c:smooth val="0"/>') + "</c:ser>";
     }).join("");
     plot = t === "bubble" ? `<c:bubbleChart><c:varyColors val="0"/>${body}<c:bubbleScale val="100"/>${axIds(false)}</c:bubbleChart>` : `<c:scatterChart><c:scatterStyle val="lineMarker"/><c:varyColors val="0"/>${body}${axIds(false)}</c:scatterChart>`;
     axes = valAx(AX.cat, AX.val, "b", false, "General", spec.xTitle) + valAx(AX.val, AX.cat, "l", false, fmt2, spec.yTitle);
@@ -34534,18 +34985,18 @@ function chartXml(spec, sheet) {
 }
 var axTitle = (t) => t ? title(t) : "";
 function catAx(id, cross, pos, second, t) {
-  return `<c:catAx><c:axId val="${id}"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="${second ? 1 : 0}"/><c:axPos val="${pos}"/>${axTitle(t)}<c:numFmt formatCode="General" sourceLinked="0"/><c:majorTickMark val="out"/><c:minorTickMark val="none"/><c:tickLblPos val="nextTo"/><c:crossAx val="${cross}"/><c:crosses val="autoZero"/><c:auto val="1"/><c:lblAlgn val="ctr"/><c:lblOffs\
-et val="100"/><c:noMultiLvlLbl val="0"/></c:catAx>`;
+  return `<c:catAx><c:axId val="${id}"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="${second ? 1 : 0}"/><c:axPos val="${pos}"/>${axTitle(t)}<c:numFmt formatCode="General" sourceLinked="0"/><c:majorTickMark val="out"/><c:minorTickMark val="none"/><c:tickLblPos val="nextTo"/><c:crossAx val="${cross}"/><c:crosses val="autoZero"/><c:auto val="1"/><c:lblAlgn val="ctr"/><c:lblOffs${
+""}et val="100"/><c:noMultiLvlLbl val="0"/></c:catAx>`;
 }
 function valAx(id, cross, pos, second, fmt2, t) {
-  return `<c:valAx><c:axId val="${id}"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="0"/><c:axPos val="${pos}"/>${second ? "" : "<c:majorGridlines/>"}${axTitle(t)}<c:numFmt formatCode="${esc4(fmt2)}" sourceLinked="0"/><c:majorTickMark val="out"/><c:minorTickMark val="none"/><c:tickLblPos val="nextTo"/><c:crossAx val="${cross}"/><c:crosses val="${second ? "max" : "autoZero"}"/\
-><c:crossBetween val="between"/></c:valAx>`;
+  return `<c:valAx><c:axId val="${id}"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="0"/><c:axPos val="${pos}"/>${second ? "" : "<c:majorGridlines/>"}${axTitle(t)}<c:numFmt formatCode="${esc4(fmt2)}" sourceLinked="0"/><c:majorTickMark val="out"/><c:minorTickMark val="none"/><c:tickLblPos val="nextTo"/><c:crossAx val="${cross}"/><c:crosses val="${second ? "max" : "autoZero"}"/${
+""}><c:crossBetween val="between"/></c:valAx>`;
 }
 var PALETTE2 = ["#2563eb", "#16a34a", "#f59e0b", "#dc2626", "#7c3aed", "#0891b2", "#db2777", "#65a30d", "#ea580c", "#475569"];
 var drawingXml = (c0, r0, cols, rows) => `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xdr:wsDr xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><xdr:twoCellAnchor editAs="oneCell"><xdr:from><xdr:col>${c0}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${r0}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>${c0 + cols}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${r0 + rows}</x\
-dr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="2" name="Chart 1"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmln\
-s:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="rId1"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor></xdr:wsDr>`;
+<xdr:wsDr xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><xdr:twoCellAnchor editAs="oneCell"><xdr:from><xdr:col>${c0}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${r0}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>${c0 + cols}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${r0 + rows}</x${
+""}dr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="2" name="Chart 1"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmln${
+""}s:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="rId1"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor></xdr:wsDr>`;
 var rels = (list2) => `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">${list2.join("")}</Relationships>`;
 var rel = (id, type, target) => `<Relationship Id="${id}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/${type}" Target="${target}"/>`;
@@ -34583,8 +35034,8 @@ function addCharts(bytes, charts) {
     let ws = read(sheetPath) || "";
     if (!/xmlns:r=/.test(ws.slice(0, 600))) ws = ws.replace("<worksheet ", '<worksheet xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" ');
     const before = ["<legacyDrawing", "<legacyDrawingHF", "<picture", "<oleObjects", "<controls", "<webPublishItems", "<tableParts", "<extLst", "</worksheet>"].map((t) => ws.indexOf(t)).filter((k) => k >= 0);
-    const at2 = Math.min(...before);
-    write(sheetPath, ws.slice(0, at2) + '<drawing r:id="rIdPW1"/>' + ws.slice(at2));
+    const at3 = Math.min(...before);
+    write(sheetPath, ws.slice(0, at3) + '<drawing r:id="rIdPW1"/>' + ws.slice(at3));
     types = types.replace("</Types>", `<Override PartName="/xl/charts/chartPW${n5}.xml" ContentType="application/vnd.openxmlformats-officedocument.drawingml.chart+xml"/><Override PartName="/xl/drawings/drawingPW${n5}.xml" ContentType="application/vnd.openxmlformats-officedocument.drawing+xml"/></Types>`);
   });
   write("[Content_Types].xml", types);
@@ -34697,9 +35148,9 @@ var Book = class {
       const [fmt2, bold, fill3] = k.split("|").map(Number);
       return `<xf numFmtId="${fmt2 || 0}" fontId="${bold ? 1 : 0}" fillId="${fill3 ? 2 : 0}" borderId="0" xfId="0"${fmt2 ? ' applyNumberFormat="1"' : ""}${bold ? ' applyFont="1"' : ""}${fill3 ? ' applyFill="1"' : ""}/>`;
     }).join("");
-    return `${XML}<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">${fmts ? `<numFmts count="${this.numFmts.size}">${fmts}</numFmts>` : ""}<fonts count="2"><font><sz val="11"/><name val="Calibri"/><family val="2"/></font><font><b/><sz val="11"/><name val="Calibri"/><family val="2"/></font></fonts><fills count="3"><fill><patternFill patternType="none"/></fill><fill><pat\
-ternFill patternType="gray125"/></fill><fill><patternFill patternType="solid"><fgColor rgb="${HEADER_FILL}"/><bgColor indexed="64"/></patternFill></fill></fills><borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders><cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="${this.styles.size}">${xfs}</cellXfs><cellSt\
-yles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles></styleSheet>`;
+    return `${XML}<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">${fmts ? `<numFmts count="${this.numFmts.size}">${fmts}</numFmts>` : ""}<fonts count="2"><font><sz val="11"/><name val="Calibri"/><family val="2"/></font><font><b/><sz val="11"/><name val="Calibri"/><family val="2"/></font></fonts><fills count="3"><fill><patternFill patternType="none"/></fill><fill><pat${
+""}ternFill patternType="gray125"/></fill><fill><patternFill patternType="solid"><fgColor rgb="${HEADER_FILL}"/><bgColor indexed="64"/></patternFill></fill></fills><borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders><cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="${this.styles.size}">${xfs}</cellXfs><cellSt${
+""}yles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles></styleSheet>`;
   }
   /** The .xlsx bytes. */
   write() {
@@ -34719,8 +35170,8 @@ yles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles></s
       const anchors = sh.images.map((im, k) => {
         img++;
         put(`xl/media/image${img}.${im.ext}`, im.bytes);
-        return `<xdr:oneCellAnchor><xdr:from><xdr:col>${im.col}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${im.row}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:ext cx="${Math.round(im.w * 9525)}" cy="${Math.round(im.h * 9525)}"/><xdr:pic><xdr:nvPicPr><xdr:cNvPr id="${k + 2}" name="Picture ${k + 1}"/><xdr:cNvPicPr><a:picLocks noChangeAspect="1"/></xdr:cNvPicPr></xdr:nvPicPr><xdr:blipFill><\
-a:blip r:embed="rId${k + 1}"/><a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(im.w * 9525)}" cy="${Math.round(im.h * 9525)}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/></xdr:oneCellAnchor>`;
+        return `<xdr:oneCellAnchor><xdr:from><xdr:col>${im.col}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${im.row}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:ext cx="${Math.round(im.w * 9525)}" cy="${Math.round(im.h * 9525)}"/><xdr:pic><xdr:nvPicPr><xdr:cNvPr id="${k + 2}" name="Picture ${k + 1}"/><xdr:cNvPicPr><a:picLocks noChangeAspect="1"/></xdr:cNvPicPr></xdr:nvPicPr><xdr:blipFill><${
+""}a:blip r:embed="rId${k + 1}"/><a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(im.w * 9525)}" cy="${Math.round(im.h * 9525)}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/></xdr:oneCellAnchor>`;
       });
       let first = img - sh.images.length;
       put(`xl/drawings/_rels/drawing${n5}.xml.rels`, rels2(sh.images.map((im, k) => [`rId${k + 1}`, "image", `../media/image${++first}.${im.ext}`])));
@@ -34741,12 +35192,12 @@ a:blip r:embed="rId${k + 1}"/><a:stretch><a:fillRect/></a:stretch></xdr:blipFill
     put("xl/styles.xml", this.stylesXml());
     put("xl/workbook.xml", `${XML}<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="${R}"><bookViews><workbookView/></bookViews><sheets>${this.sheets.map((s, i) => `<sheet name="${esc4(s.name)}" sheetId="${i + 1}" r:id="rId${i + 1}"/>`).join("")}</sheets><calcPr calcId="171027"${this.fullCalcOnLoad ? ' fullCalcOnLoad="1"' : ""}/></workbook>`);
     put("xl/_rels/workbook.xml.rels", rels2([...this.sheets.map((s, i) => [`rId${i + 1}`, "worksheet", `worksheets/sheet${i + 1}.xml`]), [`rId${this.sheets.length + 1}`, "styles", "styles.xml"]]));
-    put("docProps/core.xml", `${XML}<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title>${esc4(this.title)}</dc:title><dc:creator>${esc4(this.creator)}</dc:creator><dcterms:created xsi:type="dcterms:W\
-3CDTF">${(/* @__PURE__ */ new Date()).toISOString().replace(/\.\d+Z$/, "Z")}</dcterms:created></cp:coreProperties>`);
+    put("docProps/core.xml", `${XML}<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title>${esc4(this.title)}</dc:title><dc:creator>${esc4(this.creator)}</dc:creator><dcterms:created xsi:type="dcterms:W${
+""}3CDTF">${(/* @__PURE__ */ new Date()).toISOString().replace(/\.\d+Z$/, "Z")}</dcterms:created></cp:coreProperties>`);
     put("_rels/.rels", rels2([["rId1", "officeDocument", "xl/workbook.xml"], ["rId2", "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties", "docProps/core.xml"]]));
-    put("[Content_Types].xml", `${XML}<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="png" ContentType="image/png"/><Default Extension="jpeg" ContentType="image/jpeg"/><Override PartName="/xl/workbo\
-ok.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>${over.map(([p, t]) => `<Override PartName="${p}" ContentType="${t}\
-"/>`).join("")}</Types>`);
+    put("[Content_Types].xml", `${XML}<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="png" ContentType="image/png"/><Default Extension="jpeg" ContentType="image/jpeg"/><Override PartName="/xl/workbo${
+""}ok.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>${over.map(([p, t]) => `<Override PartName="${p}" ContentType="${t}${
+""}"/>`).join("")}</Types>`);
     return out;
   }
 };
@@ -34856,11 +35307,11 @@ function subtotalFn(c, st) {
   }
   return null;
 }
-function totalFormula(rows, at2, c, made) {
-  const row = rows[at2];
+function totalFormula(rows, at3, c, made) {
+  const row = rows[at3];
   if (typeof c.value !== "number" || !Number.isFinite(c.value)) return null;
   const covered = [];
-  for (let k = at2 - 1; k >= 0; k--) {
+  for (let k = at3 - 1; k >= 0; k--) {
     const r = rows[k];
     if (r.kind === "header") break;
     if (row.kind === "groupFooter" && (r.kind === "groupFooter" || r.kind === "groupHeader") && r.level <= row.level) break;
@@ -35022,8 +35473,8 @@ init_fonts();
 var TW = 20;
 var EMU = 12700;
 var CONTENT_TYPES = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="png" ContentType="image/png"/><Default Extension="jpeg" ContentType="image/jpeg"/><Default Extension="svg" ContentType="image/svg+xml"/><Override Part\
-Name="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/><Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/></Types>`;
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="png" ContentType="image/png"/><Default Extension="jpeg" ContentType="image/jpeg"/><Default Extension="svg" ContentType="image/svg+xml"/><Override Part${
+""}Name="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/><Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/></Types>`;
 var RELS = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/></Relationships>`;
 var XML_CHUNK = 4 * 1024 * 1024;
@@ -35148,8 +35599,8 @@ function table(cells, indentPt, pics) {
     }
     return `<w:tr>${r.kind === "header" ? "<w:trPr><w:tblHeader/></w:trPr>" : ""}${tcs.join("")}</w:tr>`;
   }).join("");
-  return `<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>${indentPt > 0 ? `<w:tblInd w:w="${Math.round(indentPt * TW)}" w:type="dxa"/>` : ""}<w:tblBorders>${tblB}</w:tblBorders><w:tblLayout w:type="fixed"/><w:tblCellMar><w:left w:w="60" w:type="dxa"/><w:right w:w="60" w:type="dxa"/></w:tblCellMar></w:tblPr><w:tblGrid>${grid}</w:tblGrid>${out}</w:tbl><w:p><w:pPr><w:spacing w:before="0" w:after="0"/\
-></w:pPr></w:p>`;
+  return `<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>${indentPt > 0 ? `<w:tblInd w:w="${Math.round(indentPt * TW)}" w:type="dxa"/>` : ""}<w:tblBorders>${tblB}</w:tblBorders><w:tblLayout w:type="fixed"/><w:tblCellMar><w:left w:w="60" w:type="dxa"/><w:right w:w="60" w:type="dxa"/></w:tblCellMar></w:tblPr><w:tblGrid>${grid}</w:tblGrid>${out}</w:tbl><w:p><w:pPr><w:spacing w:before="0" w:after="0"/${
+""}></w:pPr></w:p>`;
 }
 function layoutRow(row, margin) {
   const cols = [], cells = [];
@@ -35167,8 +35618,8 @@ function layoutRow(row, margin) {
     x = c.x + c.w;
   }
   const ind = row[0].it.clip.x - margin;
-  return `<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>${Math.abs(ind) > 0.5 ? `<w:tblInd w:w="${Math.round(ind * TW)}" w:type="dxa"/>` : ""}<w:tblBorders><w:top w:val="nil"/><w:left w:val="nil"/><w:bottom w:val="nil"/><w:right w:val="nil"/><w:insideH w:val="nil"/><w:insideV w:val="nil"/></w:tblBorders><w:tblLayout w:type="fixed"/><w:tblCellMar><w:left w:w="0" w:type="dxa"/><w:right w:w="0" w:ty\
-pe="dxa"/></w:tblCellMar><w:tblLook w:val="0000"/></w:tblPr><w:tblGrid>${cols.map((w) => `<w:gridCol w:w="${Math.round(w * TW)}"/>`).join("")}</w:tblGrid><w:tr>${cells.join("")}</w:tr></w:tbl><w:p><w:pPr><w:spacing w:before="0" w:after="40"/><w:rPr><w:sz w:val="4"/></w:rPr></w:pPr></w:p>`;
+  return `<w:tbl><w:tblPr><w:tblW w:w="0" w:type="auto"/>${Math.abs(ind) > 0.5 ? `<w:tblInd w:w="${Math.round(ind * TW)}" w:type="dxa"/>` : ""}<w:tblBorders><w:top w:val="nil"/><w:left w:val="nil"/><w:bottom w:val="nil"/><w:right w:val="nil"/><w:insideH w:val="nil"/><w:insideV w:val="nil"/></w:tblBorders><w:tblLayout w:type="fixed"/><w:tblCellMar><w:left w:w="0" w:type="dxa"/><w:right w:w="0" w:ty${
+""}pe="dxa"/></w:tblCellMar><w:tblLook w:val="0000"/></w:tblPr><w:tblGrid>${cols.map((w) => `<w:gridCol w:w="${Math.round(w * TW)}"/>`).join("")}</w:tblGrid><w:tr>${cells.join("")}</w:tr></w:tbl><w:p><w:pPr><w:spacing w:before="0" w:after="40"/><w:rPr><w:sz w:val="4"/></w:rPr></w:pPr></w:p>`;
 }
 function exportDocx(model, opt = {}) {
   return withDeadline(
@@ -35184,10 +35635,10 @@ async function docxOf(model, opt) {
     chunks.push(u8);
   });
   const bytes = new Uint8Array(chunks.reduce((n5, c) => n5 + c.length, 0));
-  let at2 = 0;
+  let at3 = 0;
   for (const c of chunks) {
-    bytes.set(c, at2);
-    at2 += c.length;
+    bytes.set(c, at3);
+    at3 += c.length;
   }
   return bytes;
 }
@@ -35207,8 +35658,8 @@ async function writeDocx(pages, model, opt, put) {
     const id = ++docPr, cx = Math.max(1, Math.round(pic.w * EMU)), cy = Math.max(1, Math.round(pic.h * EMU));
     const name = `Picture ${id}`, descr = alt ? ` descr="${esc5(alt)}"` : "";
     const ext = svg ? `<a:extLst><a:ext uri="{96DAC541-7B7A-43D3-8B79-37D633B846F1}"><asvg:svgBlip xmlns:asvg="http://schemas.microsoft.com/office/drawing/2016/SVG/main" r:embed="${svg}"/></a:ext></a:extLst>` : "";
-    return `<w:r><w:drawing><wp:inline distT="0" distB="0" distL="0" distR="0"><wp:extent cx="${cx}" cy="${cy}"/><wp:docPr id="${id}" name="${name}"${descr}/><wp:cNvGraphicFramePr><a:graphicFrameLocks noChangeAspect="1"/></wp:cNvGraphicFramePr><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic><pic:nvPicPr><pic:cNvPr id="${id}" name="${name}"${descr}/\
-><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${main}">${ext}</a:blip><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic></wp:inline></w:drawing></w:r>`;
+    return `<w:r><w:drawing><wp:inline distT="0" distB="0" distL="0" distR="0"><wp:extent cx="${cx}" cy="${cy}"/><wp:docPr id="${id}" name="${name}"${descr}/><wp:cNvGraphicFramePr><a:graphicFrameLocks noChangeAspect="1"/></wp:cNvGraphicFramePr><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic><pic:nvPicPr><pic:cNvPr id="${id}" name="${name}"${descr}/${
+""}><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${main}">${ext}</a:blip><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic></wp:inline></w:drawing></w:r>`;
   };
   const picOpt = { fontStore: opt.fontStore, fetchImage: opt.fetchImage, rasterize: opt.rasterize };
   const pageXml = async (pg) => {
@@ -35351,12 +35802,12 @@ async function writeDocx(pages, model, opt, put) {
   const lang = `<w:lang w:val="${esc5(opt.lang || model.locale || "en-US")}"/>`;
   const headings = [28, 24, 22, 20, 18, 18].map((sz, i) => `<w:style w:type="paragraph" w:styleId="Heading${i + 1}"><w:name w:val="heading ${i + 1}"/><w:basedOn w:val="Normal"/><w:next w:val="Normal"/><w:qFormat/><w:pPr><w:keepNext/><w:outlineLvl w:val="${i}"/></w:pPr><w:rPr><w:b/><w:sz w:val="${sz}"/></w:rPr></w:style>`).join("");
   const styles = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:styles xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:docDefaults><w:rPrDefault><w:rPr><w:rFonts w:ascii="Inter" w:hAnsi="Inter" w:cs="Inter"/><w:sz w:val="18"/>${lang}</w:rPr></w:rPrDefault><w:pPrDefault><w:pPr><w:spacing w:after="0" w:line="240" w:lineRule="auto"/></w:pPr></w:pPrDefault></w:docDefaults><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:\
-name w:val="Normal"/></w:style>${headings}</w:styles>`;
+<w:styles xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:docDefaults><w:rPrDefault><w:rPr><w:rFonts w:ascii="Inter" w:hAnsi="Inter" w:cs="Inter"/><w:sz w:val="18"/>${lang}</w:rPr></w:rPrDefault><w:pPrDefault><w:pPr><w:spacing w:after="0" w:line="240" w:lineRule="auto"/></w:pPr></w:pPrDefault></w:docDefaults><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:${
+""}name w:val="Normal"/></w:style>${headings}</w:styles>`;
   const now = (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
   const core = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title>${esc5(opt.title || model.name || "Report")}</dc:title>${opt.author ? `<dc:creator>${esc5(opt.author)}</dc:creator>` : ""}<dcterms:created xsi:type=\
-"dcterms:W3CDTF">${now}</dcterms:created></cp:coreProperties>`;
+<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title>${esc5(opt.title || model.name || "Report")}</dc:title>${opt.author ? `<dc:creator>${esc5(opt.author)}</dc:creator>` : ""}<dcterms:created xsi:type=${
+""}"dcterms:W3CDTF">${now}</dcterms:created></cp:coreProperties>`;
   await file("word/_rels/document.xml.rels", strToU83(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>${media.map((m) => `<Relationship Id="${m.rid}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/${m.name}"/>`).join("")}</Relationships>`));
   await file("word/styles.xml", strToU83(styles));
@@ -35446,8 +35897,8 @@ async function pptxOf(model, opt) {
       const svg = pic.png && pic.svg ? media(strToU84(pic.svg), "svg") : null;
       const n5 = ++id;
       const ext = svg ? `<a:extLst><a:ext uri="{96DAC541-7B7A-43D3-8B79-37D633B846F1}"><asvg:svgBlip xmlns:asvg="http://schemas.microsoft.com/office/drawing/2016/SVG/main" r:embed="${svg}"/></a:ext></a:extLst>` : "";
-      return `<p:pic><p:nvPicPr><p:cNvPr id="${n5}" name="Picture ${n5}" descr="${esc6(alt)}"/><p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr><p:nvPr/></p:nvPicPr><p:blipFill><a:blip r:embed="${main}">${ext}</a:blip><a:stretch><a:fillRect/></a:stretch></p:blipFill><p:spPr><a:xfrm><a:off x="${e(pic.x)}" y="${e(pic.y)}"/><a:ext cx="${Math.max(1, e(pic.w))}" cy="${Math.max(1, e(pic.h))}"/><\
-/a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr></p:pic>`;
+      return `<p:pic><p:nvPicPr><p:cNvPr id="${n5}" name="Picture ${n5}" descr="${esc6(alt)}"/><p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr><p:nvPr/></p:nvPicPr><p:blipFill><a:blip r:embed="${main}">${ext}</a:blip><a:stretch><a:fillRect/></a:stretch></p:blipFill><p:spPr><a:xfrm><a:off x="${e(pic.x)}" y="${e(pic.y)}"/><a:ext cx="${Math.max(1, e(pic.w))}" cy="${Math.max(1, e(pic.h))}"/><${
+""}/a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr></p:pic>`;
     };
     const sp = (name, x, y, w, h, geom, body, extra = "") => {
       const n5 = ++id;
@@ -35530,43 +35981,133 @@ async function pptxOf(model, opt) {
     slides.push(pi + 1);
   }
   const cx = Math.min(51206400, Math.max(914400, e(W2))), cy = Math.min(51206400, Math.max(914400, e(H)));
-  files["ppt/presentation.xml"] = strToU84(`${XML2}<p:presentation ${NS2} saveSubsetFonts="1"><p:sldMasterIdLst><p:sldMasterId id="2147483648" r:id="rId1"/></p:sldMasterIdLst><p:sldIdLst>${slides.map((n5, i) => `<p:sldId id="${256 + i}" r:id="rId${n5 + 2}"/>`).join("")}</p:sldIdLst><p:sldSz cx="${cx}" cy="${cy}"/><p:notesSz cx="${cy}" cy="${cx}"/><p:defaultTextStyle><a:defPPr><a:defRPr lang="${lang}\
-"/></a:defPPr></p:defaultTextStyle></p:presentation>`);
-  files["ppt/_rels/presentation.xml.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" Target="slideMasters/slideMaster1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme\
-" Target="theme/theme1.xml"/>${slides.map((n5) => `<Relationship Id="rId${n5 + 2}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" Target="slides/slide${n5}.xml"/>`).join("")}</Relationships>`);
+  files["ppt/presentation.xml"] = strToU84(`${XML2}<p:presentation ${NS2} saveSubsetFonts="1"><p:sldMasterIdLst><p:sldMasterId id="2147483648" r:id="rId1"/></p:sldMasterIdLst><p:sldIdLst>${slides.map((n5, i) => `<p:sldId id="${256 + i}" r:id="rId${n5 + 2}"/>`).join("")}</p:sldIdLst><p:sldSz cx="${cx}" cy="${cy}"/><p:notesSz cx="${cy}" cy="${cx}"/><p:defaultTextStyle><a:defPPr><a:defRPr lang="${lang}${
+""}"/></a:defPPr></p:defaultTextStyle></p:presentation>`);
+  files["ppt/_rels/presentation.xml.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" Target="slideMasters/slideMaster1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme${
+""}" Target="theme/theme1.xml"/>${slides.map((n5) => `<Relationship Id="rId${n5 + 2}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" Target="slides/slide${n5}.xml"/>`).join("")}</Relationships>`);
   const emptyTree = '<p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr/></p:spTree>';
-  files["ppt/slideMasters/slideMaster1.xml"] = strToU84(`${XML2}<p:sldMaster ${NS2}><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg>${emptyTree}</p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:sldLayoutIdLst><p:sldLay\
-outId id="2147483649" r:id="rId1"/></p:sldLayoutIdLst><p:txStyles><p:titleStyle><a:lvl1pPr><a:defRPr sz="2400"/></a:lvl1pPr></p:titleStyle><p:bodyStyle><a:lvl1pPr><a:defRPr sz="1200"/></a:lvl1pPr></p:bodyStyle><p:otherStyle><a:lvl1pPr><a:defRPr sz="1200"/></a:lvl1pPr></p:otherStyle></p:txStyles></p:sldMaster>`);
-  files["ppt/slideMasters/_rels/slideMaster1.xml.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/rel\
-ationships/theme" Target="../theme/theme1.xml"/></Relationships>`);
+  files["ppt/slideMasters/slideMaster1.xml"] = strToU84(`${XML2}<p:sldMaster ${NS2}><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg>${emptyTree}</p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:sldLayoutIdLst><p:sldLay${
+""}outId id="2147483649" r:id="rId1"/></p:sldLayoutIdLst><p:txStyles><p:titleStyle><a:lvl1pPr><a:defRPr sz="2400"/></a:lvl1pPr></p:titleStyle><p:bodyStyle><a:lvl1pPr><a:defRPr sz="1200"/></a:lvl1pPr></p:bodyStyle><p:otherStyle><a:lvl1pPr><a:defRPr sz="1200"/></a:lvl1pPr></p:otherStyle></p:txStyles></p:sldMaster>`);
+  files["ppt/slideMasters/_rels/slideMaster1.xml.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/rel${
+""}ationships/theme" Target="../theme/theme1.xml"/></Relationships>`);
   files["ppt/slideLayouts/slideLayout1.xml"] = strToU84(`${XML2}<p:sldLayout ${NS2} type="blank" preserve="1"><p:cSld name="Blank">${emptyTree}</p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>`);
   files["ppt/slideLayouts/_rels/slideLayout1.xml.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>`);
   files["ppt/theme/theme1.xml"] = strToU84(THEME);
   const now = (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z");
-  files["docProps/core.xml"] = strToU84(`${XML2}<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title>${esc6(opt.title || model.name || "Report")}</dc:title>${opt.author ? `<dc:creator>${esc6(opt.author)}\
-</dc:creator>` : ""}<dcterms:created xsi:type="dcterms:W3CDTF">${now}</dcterms:created></cp:coreProperties>`);
-  files["_rels/.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="ppt/presentation.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docP\
-rops/core.xml"/></Relationships>`);
-  files["[Content_Types].xml"] = strToU84(`${XML2}<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="png" ContentType="image/png"/><Default Extension="jpeg" ContentType="image/jpeg"/><Default Extension\
-="svg" ContentType="image/svg+xml"/><Override PartName="/ppt/presentation.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml"/><Override PartName="/ppt/slideMasters/slideMaster1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml"/><Override PartName="/ppt/slideLayouts/slideLayout1.xml" ContentType="applic\
-ation/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>${slides.map((n5) => `<Override PartName="/ppt/slides/slide${n5}.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slide+xml"/>`).join("")}<Override PartName="/docProps/core.xml" Conte\
-ntType="application/vnd.openxmlformats-package.core-properties+xml"/></Types>`);
+  files["docProps/core.xml"] = strToU84(`${XML2}<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title>${esc6(opt.title || model.name || "Report")}</dc:title>${opt.author ? `<dc:creator>${esc6(opt.author)}${
+""}</dc:creator>` : ""}<dcterms:created xsi:type="dcterms:W3CDTF">${now}</dcterms:created></cp:coreProperties>`);
+  files["_rels/.rels"] = strToU84(`${XML2}<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="ppt/presentation.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docP${
+""}rops/core.xml"/></Relationships>`);
+  files["[Content_Types].xml"] = strToU84(`${XML2}<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="png" ContentType="image/png"/><Default Extension="jpeg" ContentType="image/jpeg"/><Default Extension${
+""}="svg" ContentType="image/svg+xml"/><Override PartName="/ppt/presentation.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml"/><Override PartName="/ppt/slideMasters/slideMaster1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml"/><Override PartName="/ppt/slideLayouts/slideLayout1.xml" ContentType="applic${
+""}ation/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>${slides.map((n5) => `<Override PartName="/ppt/slides/slide${n5}.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slide+xml"/>`).join("")}<Override PartName="/docProps/core.xml" Conte${
+""}ntType="application/vnd.openxmlformats-package.core-properties+xml"/></Types>`);
   return zipSync3(files, { level: 6 });
 }
-var THEME = `${XML2}<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="ReportWright"><a:themeElements><a:clrScheme name="ReportWright"><a:dk1><a:srgbClr val="000000"/></a:dk1><a:lt1><a:srgbClr val="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F2328"/></a:dk2><a:lt2><a:srgbClr val="E7E6E6"/></a:lt2><a:accent1><a:srgbClr val="2563EB"/></a:accent1><a:accent2><a:srgbClr val="F5\
-9E0B"/></a:accent2><a:accent3><a:srgbClr val="16A34A"/></a:accent3><a:accent4><a:srgbClr val="DC2626"/></a:accent4><a:accent5><a:srgbClr val="7C3AED"/></a:accent5><a:accent6><a:srgbClr val="0891B2"/></a:accent6><a:hlink><a:srgbClr val="0563C1"/></a:hlink><a:folHlink><a:srgbClr val="954F72"/></a:folHlink></a:clrScheme><a:fontScheme name="ReportWright"><a:majorFont><a:latin typeface="Inter"/><a:ea t\
-ypeface=""/><a:cs typeface=""/></a:majorFont><a:minorFont><a:latin typeface="Inter"/><a:ea typeface=""/><a:cs typeface=""/></a:minorFont></a:fontScheme><a:fmtScheme name="ReportWright"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:fillStyleLst><a:lnStyleLst><a:ln w="\
-6350"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:ln><a:ln w="12700"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:ln><a:ln w="19050"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle></a:effectStyl\
-eLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>`;
+var THEME = `${XML2}<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="ReportWright"><a:themeElements><a:clrScheme name="ReportWright"><a:dk1><a:srgbClr val="000000"/></a:dk1><a:lt1><a:srgbClr val="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F2328"/></a:dk2><a:lt2><a:srgbClr val="E7E6E6"/></a:lt2><a:accent1><a:srgbClr val="2563EB"/></a:accent1><a:accent2><a:srgbClr val="F5${
+""}9E0B"/></a:accent2><a:accent3><a:srgbClr val="16A34A"/></a:accent3><a:accent4><a:srgbClr val="DC2626"/></a:accent4><a:accent5><a:srgbClr val="7C3AED"/></a:accent5><a:accent6><a:srgbClr val="0891B2"/></a:accent6><a:hlink><a:srgbClr val="0563C1"/></a:hlink><a:folHlink><a:srgbClr val="954F72"/></a:folHlink></a:clrScheme><a:fontScheme name="ReportWright"><a:majorFont><a:latin typeface="Inter"/><a:ea t${
+""}ypeface=""/><a:cs typeface=""/></a:majorFont><a:minorFont><a:latin typeface="Inter"/><a:ea typeface=""/><a:cs typeface=""/></a:minorFont></a:fontScheme><a:fmtScheme name="ReportWright"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:fillStyleLst><a:lnStyleLst><a:ln w="${
+""}6350"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:ln><a:ln w="12700"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:ln><a:ln w="19050"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle></a:effectStyl${
+""}eLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:solidFill><a:schemeClr val="phClr"/></a:solidFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>`;
+
+// package.json
+var package_default = {
+  name: "reportwright",
+  version: "0.13.2-rc.2",
+  license: "MIT",
+  private: true,
+  engines: { node: "22.x" },
+  type: "module",
+  bin: {
+    reportwright: "bin/pw.mjs",
+    pw: "bin/pw.mjs"
+  },
+  scripts: {
+    dev: "next dev -p 3000",
+    build: "node scripts/build-embed.mjs && node scripts/build-worker.mjs && next build",
+    start: "next start -p 3000",
+    test: "vitest run",
+    pw: "node bin/pw.mjs",
+    "test:reports": "node bin/pw.mjs test reports",
+    "test:diff": "vitest run tests/diff",
+    "diff:engines": "node scripts/diff-engines.mjs",
+    "fonts:cjk": "node scripts/fetch-fonts-cjk.mjs",
+    "lint:engine": "node scripts/check-engine-boundary.mjs",
+    typecheck: "node scripts/typecheck.mjs",
+    "test:e2e": ("for t in build-from-scratch smoke expr-editor phase2 phase3 phase4 api progressive phase-bc data-setup galleries charts-p5 tablix ai designer-gaps reuse ssrs-import outline-charts layout-charts-b4 exports-b2 import-b6 data-xml gov-b5 ux-r1c r3b-conflict r4-fixes b2-ui b2-a11y b6j-viewer-handle b6k-designer-a11y b7a-axe b6k-designer-csp viewer-strict-csp viewer-font-errors viewer-e"+
+"xport-in-ready drilldown fonts standalone-viewer vite-build react-wrapper; do node tests/e2e/$t.mjs || exit 1; done"),
+    sample: "node scripts/make-sample.mjs",
+    "build:embed": "node scripts/build-embed.mjs",
+    "build:packages": "node scripts/build-embed.mjs && node scripts/build-packages.mjs",
+    "scan:packages": "node scripts/scan-packages.mjs",
+    perf: "node scripts/perf.mjs",
+    "build:site": "node scripts/build-site.mjs"
+  },
+  dependencies: {
+    "@anthropic-ai/sdk": "^0.131.0",
+    "@codemirror/autocomplete": "^6.20.3",
+    "@codemirror/commands": "^6.11.1",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/state": "^6.7.6",
+    "@codemirror/view": "^6.43.13",
+    "@lezer/highlight": "^1.2.5",
+    "@node-saml/node-saml": "^5.1.0",
+    "@pdf-lib/fontkit": "^1.1.1",
+    "@pdf-lib/standard-fonts": "^1.0.0",
+    "@signpdf/placeholder-pdf-lib": "^3.3.0",
+    "@signpdf/signer-p12": "^3.3.0",
+    "@signpdf/signpdf": "^3.3.0",
+    "bidi-js": "~1.0.3",
+    "bwip-js": "^4.11.4",
+    fflate: "^0.8.3",
+    harfbuzzjs: "^1.6.2",
+    immer: "^11.1.21",
+    jose: "^6.2.12",
+    next: "^16.3.8",
+    "node-forge": "^1.4.0",
+    nodemailer: "^10.0.14",
+    "pdf-lib": "^1.17.1",
+    react: "^19.3.0",
+    "react-dom": "^19.3.0",
+    zustand: "^5.0.15"
+  },
+  devDependencies: {
+    "@expo-google-fonts/inter": "^0.4.2",
+    "@expo-google-fonts/jetbrains-mono": "^0.4.1",
+    "axe-core": "^4.14.0",
+    esbuild: "^0.28.2",
+    exceljs: "^4.4.0",
+    playwright: "^1.56.0",
+    typescript: "^5.9.3",
+    vitest: "^5.0.3",
+    "xml-crypto": "^6.3.2"
+  },
+  overrides: {
+    uuid: "^11.1.1"
+  },
+  optionalDependencies: {
+    "@google-cloud/bigquery": "^9.1.0",
+    mssql: "^12.7.2",
+    mysql2: "^3.24.5",
+    oracledb: "^7.0.1",
+    pg: "^8.23.1",
+    "snowflake-sdk": "^3.4.0"
+  }
+};
 
 // bin/pw.mjs
-var ROOT2 = path.join(import.meta.dirname, "..");
-var PUB = fs.existsSync(path.join(ROOT2, "public", "fonts")) ? path.join(ROOT2, "public") : path.join(path.dirname(createRequire(import.meta.url).resolve("@reportwright/fonts/package.json")), "public");
+var ROOT2 = path2.join(import.meta.dirname, "..");
+var PUB = fs2.existsSync(path2.join(ROOT2, "public", "fonts")) ? path2.join(ROOT2, "public") : path2.join(path2.dirname(createRequire(import.meta.url).resolve("@reportwright/fonts/package.json")), "public");
 var HELP = `pw render <report.pw.json> [-p name=value]… [-d source=data.json]… [-f pdf|xlsx|docx|pptx|html|csv|json|txt] [-o file|-] [--base URL [--allow-internal]] [--pdfa] [--ua]
           [--values] [--static] [--layout]
           [--password PW] [--owner-password PW] [--deny print|modify|copy|annotate|fillForms|accessibility|assemble|printHighQuality]…
 pw import <report.jrxml|.rdl|.rptdesign> [-o out.pw.json]
                                    convert a JasperReports, SSRS or BIRT report to a ReportWright definition
+pw import <folder> -o <outDir> [--recursive] [--force] [--verify] [--report path] [--max-files N] [--max-bytes N]
+                                   bulk import (.rdl, .rdlc, .rds, .jrxml, .jrtx, .rptdesign, .rdlx-json and images) into
+                                   outDir with import-report.json and .html; never overwrites an output edited since the
+                                   last import (--force does); exit 0 all imported, 2 some failed, 1 none (see the CLI README)
+pw --version, pw -v                the CLI and engine versions
 pw test [folder] [--update] [--layout]
                                    render every <folder>/__tests__/*.test.json case and compare it with its snapshot
                                    (the words; --layout: the layout, see the CLI README)
@@ -35593,9 +36134,9 @@ pw migrate-storage --to <url> [--from file|<url>]   (SERVER ONLY, as above)
                                    jobs, fonts, settings, blobs, the audit log) from one storage to another, e.g. the
                                    files in this folder to sqlite:/srv/pw.db or postgres://…; stop the server first
 Exit codes: 0 ok, 1 a test failed, the pages differ or the audit log does not check, 2 bad usage.`;
-var fontStore = new FontStore((k) => fs.readFileSync(path.join(PUB, "fonts", fontFile(k))));
-var subset = createSubsetter(() => fs.promises.readFile(path.join(PUB, "harfbuzz-subset.wasm")));
-var readJson = (f4) => JSON.parse(fs.readFileSync(f4, "utf8").replace(/^/, ""));
+var fontStore = new FontStore((k) => fs2.readFileSync(path2.join(PUB, "fonts", fontFile(k))));
+var subset = createSubsetter(() => fs2.promises.readFile(path2.join(PUB, "harfbuzz-subset.wasm")));
+var readJson = (f4) => JSON.parse(fs2.readFileSync(f4, "utf8").replace(/^/, ""));
 var pairs2 = (list2 = []) => Object.fromEntries(list2.map((s) => {
   const i = s.indexOf("=");
   if (i < 1) usage(`"${s}" should be name=value`);
@@ -35620,7 +36161,7 @@ function withData(def, data) {
 var siblingLoader = (file) => async (id) => {
   if (!/^[a-z0-9][a-z0-9-]{0,63}$/.test(id)) throw new Error(`Report "${id}" not found`);
   try {
-    return readJson(path.join(path.dirname(path.resolve(file)), `${id}.pw.json`));
+    return readJson(path2.join(path2.dirname(path2.resolve(file)), `${id}.pw.json`));
   } catch {
     throw new Error(`Report "${id}" not found`);
   }
@@ -35652,10 +36193,10 @@ function renderFailed(e2, base) {
 async function writePdf(def, { parameters = {}, data, base, internal = false, file, exportData = false }, pdfOpts, out) {
   const d = withData(def, data);
   const tmp = `${out}.${process.pid}.part`;
-  const sink = fs.createWriteStream(tmp);
+  const sink = fs2.createWriteStream(tmp);
   const stop = (sig, n5) => () => {
     sink.destroy();
-    fs.rmSync(tmp, { force: true });
+    fs2.rmSync(tmp, { force: true });
     process.exit(128 + n5);
   };
   const sigs = [["SIGINT", 2], ["SIGTERM", 15], ["SIGHUP", 1]].map(([s, n5]) => [s, stop(s, n5)]);
@@ -35676,11 +36217,11 @@ async function writePdf(def, { parameters = {}, data, base, internal = false, fi
       sink.once("error", no2);
       sink.end(ok);
     });
-    fs.renameSync(tmp, out);
+    fs2.renameSync(tmp, out);
     return { pages: r.pages, streamed: r.streamed, warnings: uniq2(r.streamed ? r.warnings : r.warnings.slice(1)) };
   } catch (e2) {
     sink.destroy();
-    fs.rmSync(tmp, { force: true });
+    fs2.rmSync(tmp, { force: true });
     renderFailed(e2, base);
   } finally {
     for (const [s, f4] of sigs) process.off(s, f4);
@@ -35707,20 +36248,20 @@ function diffLines(a, b, context = 2) {
   const keep = ops.map((o, k) => o[0] !== " " || ops.slice(Math.max(0, k - context), k + context + 1).some((x) => x[0] !== " "));
   return ops.filter((_, k) => keep[k]).map(([op, line3]) => `${op} ${line3}`);
 }
-function compare(label, before, after) {
+function compare(label, before, after, out = console.log) {
   const pa = pageTexts(before), pb = pageTexts(after);
   let changed = false;
   if (pa.length !== pb.length) {
-    console.log(`${label}: ${pa.length} pages → ${pb.length} pages`);
+    out(`${label}: ${pa.length} pages → ${pb.length} pages`);
     changed = true;
   }
   for (let k = 0; k < Math.max(pa.length, pb.length); k++) {
     const d = diffLines(pa[k] || [], pb[k] || []);
     if (!d.some((l) => l[0] !== " ")) continue;
     changed = true;
-    console.log(`${label}: page ${k + 1} changed`);
-    for (const l of d.slice(0, 60)) console.log(l);
-    if (d.length > 60) console.log(`  … ${d.length - 60} more lines`);
+    out(`${label}: page ${k + 1} changed`);
+    for (const l of d.slice(0, 60)) out(l);
+    if (d.length > 60) out(`  … ${d.length - 60} more lines`);
   }
   return changed;
 }
@@ -35741,8 +36282,8 @@ async function cmdRender(args) {
   if (encrypt && fmt2 !== "pdf") usage("--password, --owner-password and --deny apply to -f pdf only");
   if (encrypt && values.pdfa) usage("a PDF/A file cannot have a password");
   if (values.ua && fmt2 !== "pdf") usage("--ua applies to -f pdf only");
-  const out = values.o ?? `${path.basename(positionals[0]).replace(/\.pw\.json$|\.json$/, "")}.${fmt2}`;
-  const pdfOpts = () => ({ title: def.name, subset, encrypt, drillBase: values.base, pdfa: values.pdfa ? { icc: fs.readFileSync(path.join(PUB, "icc", "sRGB-v2-magic.icc")) } : void 0, tagged: values.ua ? { lang: def.locale || "en" } : void 0 });
+  const out = values.o ?? `${path2.basename(positionals[0]).replace(/\.pw\.json$|\.json$/, "")}.${fmt2}`;
+  const pdfOpts = () => ({ title: def.name, subset, encrypt, drillBase: values.base, pdfa: values.pdfa ? { icc: fs2.readFileSync(path2.join(PUB, "icc", "sRGB-v2-magic.icc")) } : void 0, tagged: values.ua ? { lang: def.locale || "en" } : void 0 });
   if (fmt2 === "pdf" && out !== "-") {
     const r = await writePdf(def, ro, pdfOpts(), out);
     console.error(`pw: wrote ${out} (${r.pages} pages${r.streamed ? ", streamed" : ""}${r.warnings.length ? `, ${r.warnings.length} warnings` : ""})`);
@@ -35762,7 +36303,7 @@ async function cmdRender(args) {
   else usage(`unknown format "${fmt2}"`);
   if (out === "-") process.stdout.write(typeof bytes === "string" ? bytes : Buffer.from(bytes));
   else {
-    fs.writeFileSync(out, typeof bytes === "string" ? bytes : Buffer.from(bytes));
+    fs2.writeFileSync(out, typeof bytes === "string" ? bytes : Buffer.from(bytes));
     console.error(`pw: wrote ${out} (${model.pages.length} pages${model.warnings.length ? `, ${model.warnings.length} warnings` : ""})`);
   }
 }
@@ -35787,32 +36328,32 @@ function layoutLines(model) {
 async function cmdTest(args) {
   const { values, positionals } = parseArgs({ args, allowPositionals: true, options: { update: { type: "boolean" }, layout: { type: "boolean" } } });
   const dir = positionals[0] || "reports";
-  const testsDir = path.join(dir, "__tests__");
+  const testsDir = path2.join(dir, "__tests__");
   let files = [];
   try {
-    files = fs.readdirSync(testsDir).filter((f4) => f4.endsWith(".test.json")).sort();
+    files = fs2.readdirSync(testsDir).filter((f4) => f4.endsWith(".test.json")).sort();
   } catch {
-    fail(`no tests: add ${path.join(testsDir, "<report>.test.json")}`);
+    fail(`no tests: add ${path2.join(testsDir, "<report>.test.json")}`);
   }
   let passed = 0, failed = 0, written2 = 0;
   for (const f4 of files) {
-    const spec = readJson(path.join(testsDir, f4));
+    const spec = readJson(path2.join(testsDir, f4));
     const id = f4.replace(/\.test\.json$/, "");
-    const def = readJson(path.resolve(testsDir, spec.report));
+    const def = readJson(path2.resolve(testsDir, spec.report));
     for (const c of spec.cases || [{ name: "default" }]) {
-      const data = Object.fromEntries(Object.entries(c.data || {}).map(([k, v]) => [k, typeof v === "string" ? readJson(path.resolve(testsDir, v)) : v]));
-      const model = await renderModel(def, { parameters: c.parameters, data, now: c.now || "2026-01-01T09:00:00", state: c.state, file: path.resolve(testsDir, spec.report) });
+      const data = Object.fromEntries(Object.entries(c.data || {}).map(([k, v]) => [k, typeof v === "string" ? readJson(path2.resolve(testsDir, v)) : v]));
+      const model = await renderModel(def, { parameters: c.parameters, data, now: c.now || "2026-01-01T09:00:00", state: c.state, file: path2.resolve(testsDir, spec.report) });
       const label = `${id} › ${c.name}`;
       const layout = !!values.layout || c.layout === true;
-      const snapFile = path.join(testsDir, `${id}.${c.name}.${layout ? "layout." : ""}snap.txt`);
+      const snapFile = path2.join(testsDir, `${id}.${c.name}.${layout ? "layout." : ""}snap.txt`);
       const text2 = layout ? layoutLines(model).join("\n") + "\n" : snapshotText(label, model);
-      if (values.update || !fs.existsSync(snapFile)) {
-        fs.writeFileSync(snapFile, text2);
+      if (values.update || !fs2.existsSync(snapFile)) {
+        fs2.writeFileSync(snapFile, text2);
         written2++;
         passed++;
         continue;
       }
-      const old = fs.readFileSync(snapFile, "utf8");
+      const old = fs2.readFileSync(snapFile, "utf8");
       if (old === text2) {
         passed++;
         continue;
@@ -35841,7 +36382,7 @@ async function cmdDiff(args) {
   const data = Object.fromEntries(Object.entries(pairs2(values.d)).map(([k, f4]) => [k, readJson(f4)]));
   const opts = { parameters: pairs2(values.p), data, base: values.base, internal: !!values["allow-internal"], now: "2026-01-01T09:00:00" };
   const [a, b] = await Promise.all(positionals.map((f4) => renderModel(readJson(f4), { ...opts, file: f4 })));
-  if (!compare(path.basename(positionals[1]), a, b)) {
+  if (!compare(path2.basename(positionals[1]), a, b)) {
     console.log("No differences.");
     return;
   }
@@ -35852,7 +36393,7 @@ async function cmdAudit(args) {
   const audit = await Promise.resolve().then(() => __toESM(require_audit(), 1));
   if (positionals[0] === "rekey") {
     const { createPrivateKey } = await import("node:crypto");
-    const old = values["old-key"] ? createPrivateKey(fs.readFileSync(values["old-key"], "utf8")) : values["old-secret"] ? audit.keyFromSecret(values["old-secret"]) : usage("give --old-secret or --old-key");
+    const old = values["old-key"] ? createPrivateKey(fs2.readFileSync(values["old-key"], "utf8")) : values["old-secret"] ? audit.keyFromSecret(values["old-secret"]) : usage("give --old-secret or --old-key");
     const e2 = await audit.rekey(old);
     console.log(`re-keyed: ${e2.detail.oldFingerprint} -> ${e2.detail.newFingerprint} (${e2.id})`);
     return;
@@ -35864,7 +36405,7 @@ async function cmdAudit(args) {
   }
   if (positionals[0] !== "verify") usage("pw audit verify | pw audit checkpoint | pw audit rekey");
   for (const k of ["from", "to"]) if (values[k] && !/^\d{4}-\d{2}-\d{2}$/.test(values[k])) usage(`--${k} is a date, YYYY-MM-DD`);
-  if (values["public-key"]) process.env.PW_AUDIT_PUBLIC_KEY = fs.readFileSync(values["public-key"], "utf8");
+  if (values["public-key"]) process.env.PW_AUDIT_PUBLIC_KEY = fs2.readFileSync(values["public-key"], "utf8");
   const r = await audit.verifyAudit({ from: values.from, to: values.to, onProgress: values.json ? void 0 : (n5) => process.stderr.write(`\r${n5} events checked`) });
   if (values.json) console.log(JSON.stringify(r, null, 2));
   else {
@@ -35887,20 +36428,73 @@ async function cmdMigrateStorage(args) {
   console.log(`copied ${n5.records} records, ${n5.versions} versions and ${n5.audit} audit events to ${values.to.replace(/\/\/[^@/]*@/, "//***@")}`);
 }
 async function cmdImport(args) {
-  const { values, positionals } = parseArgs({ args, allowPositionals: true, options: { o: { type: "string" } } });
-  if (positionals.length !== 1) usage("give one .jrxml, .rdl or .rptdesign file");
-  const { importXmlReport: importXmlReport2 } = await Promise.resolve().then(() => (init_importers(), importers_exports));
+  const { values, positionals } = parseArgs({ args, allowPositionals: true, options: { o: { type: "string" }, recursive: { type: "boolean" }, force: { type: "boolean" }, verify: { type: "boolean" }, report: { type: "string" }, "max-files": { type: "string" }, "max-bytes": { type: "string" } } });
+  if (positionals.length !== 1) usage("give one .jrxml, .rdl or .rptdesign file, or a folder");
   const file = positionals[0];
-  const r = importXmlReport2(fs.readFileSync(file, "utf8"), { name: path.basename(file).replace(/\.[^.]+$/, "") });
+  if (fs2.statSync(file, { throwIfNoEntry: false })?.isDirectory()) return importFolderCmd(file, values);
+  if (values.recursive || values.force || values.verify || values.report) usage("--recursive, --force, --verify and --report are for a folder");
+  const { importXmlReport: importXmlReport2, decodeXml: decodeXml2 } = await Promise.resolve().then(() => (init_importers(), importers_exports));
+  const r = importXmlReport2(decodeXml2(fs2.readFileSync(file)), { name: path2.basename(file).replace(/\.[^.]+$/, "") });
   for (const w of r.warnings) console.error(`pw: ${w}`);
-  if (r.error) fail(r.error);
+  if (r.error) {
+    if (r.warnings.some((w) => w.startsWith(r.error))) process.exit(1);
+    fail(r.error);
+  }
   const out = values.o || file.replace(/\.[^.]+$/, ".pw.json");
   const json = JSON.stringify(r.definition, null, 2) + "\n";
   if (out === "-") process.stdout.write(json);
-  else fs.writeFileSync(out, json);
+  else fs2.writeFileSync(out, json);
   if (out !== "-") console.error(`${out}: ${r.stats.items} items (${r.stats.mapped} mapped, ${r.stats.approximated} approximated, ${r.stats.dropped} dropped)`);
 }
+async function importFolderCmd(dir, values) {
+  if (!values.o || values.o === "-") usage("pw import <folder> needs -o <outDir>");
+  const num6 = (k) => {
+    const v = values[k];
+    if (v == null) return void 0;
+    if (!/^\d+$/.test(v) || !(Number(v) > 0)) usage(`--${k} is a positive whole number`);
+    return Number(v);
+  };
+  const { importFolder: importFolder2, reportHtml: reportHtml2, exitCode: exitCode2 } = await Promise.resolve().then(() => (init_batch(), batch_exports));
+  const report = await importFolder2(dir, values.o, {
+    recursive: !!values.recursive,
+    force: !!values.force,
+    maxFiles: num6("max-files"),
+    maxBytes: num6("max-bytes"),
+    verify: values.verify ? verifyImported : void 0,
+    log: (m) => console.error(`pw: ${m}`)
+  });
+  const json = values.report && /\.json$/i.test(values.report) ? values.report : path2.join(values.report || values.o, "import-report.json");
+  const html = json.replace(/\.json$/i, ".html");
+  fs2.mkdirSync(path2.dirname(json), { recursive: true });
+  fs2.writeFileSync(json, JSON.stringify(report, null, 2) + "\n");
+  fs2.writeFileSync(html, reportHtml2(report));
+  const s = report.summary;
+  console.error(`pw: ${s.imported} of ${s.reports} reports imported${s.failed ? `, ${s.failed} failed` : ""}${s.skippedEdited ? `, ${s.skippedEdited} edited outputs kept` : ""}${s.unresolved ? `, ${s.unresolved} unresolved references` : ""}${s.refused ? `, ${s.refused} files refused` : ""}; report: ${html}`);
+  process.exitCode = exitCode2(report);
+}
+async function verifyImported({ file, definition, baseline }) {
+  const sample = file.replace(/\.pw\.json$/, ".data.json");
+  let data = {};
+  if (fs2.existsSync(sample)) data = readJson(sample);
+  const embedded = (s) => s.type === "json" && s.data != null || (s.type === "csv" || s.type === "xml") && !!s.data;
+  const missing2 = (definition.dataSources || []).filter((s) => !embedded(s) && !Object.hasOwn(data, s.name)).map((s) => `"${s.name}"`);
+  if (missing2.length) return { status: "skipped", note: `no data for ${missing2.join(", ")}: it is not embedded, and there is no ${path2.basename(sample)}` };
+  const go = (def) => render(
+    { ...def, dataSources: (def.dataSources || []).map((s) => Object.hasOwn(data, s.name) ? { name: s.name, type: "json", data: data[s.name] } : s) },
+    { fontStore, parameters: {}, now: /* @__PURE__ */ new Date("2026-01-01T09:00:00"), loadReport: siblingLoader(file), fetch: () => Promise.reject(new Error("pw import --verify makes no network requests")) }
+  );
+  const model = await go(definition);
+  if (!baseline) return { status: "ok", pages: model.pages.length, warnings: model.warnings.length, note: "renders (no earlier output to compare with)" };
+  const diff = [];
+  const changed = compare(path2.basename(file), await go(baseline), model, (l) => diff.push(l));
+  return { status: changed ? "changed" : "ok", pages: model.pages.length, warnings: model.warnings.length, note: changed ? "renders differently from the output it replaced" : "renders the same as the output it replaced", diff };
+}
 var commands = { render: cmdRender, import: cmdImport, test: cmdTest, diff: cmdDiff, audit: cmdAudit, "migrate-storage": cmdMigrateStorage };
+if (cmd === "--version" || cmd === "-v") {
+  const cli = JSON.parse(fs2.readFileSync(path2.join(ROOT2, "package.json"), "utf8"));
+  console.log(`pw ${cli.version} (${cli.name}), engine ${package_default.version}`);
+  process.exit(0);
+}
 if (!commands[cmd]) usage(cmd && cmd !== "help" && cmd !== "--help" ? `unknown command "${cmd}"` : "");
 try {
   await commands[cmd](rest);