ooxml-core 1.14.0 → 1.16.0

package/dist/teams/index.mjs

@@ -262,7 +262,7 @@ var init_namespaces = __esm({
     };
   }
 });
-function checkXmlLimits(xml, label5, limits = {}) {
+function checkXmlLimits(xml, label2, limits = {}) {
   const maxDepth = limits.maxDepth ?? DEFAULT_XML_LIMITS.maxDepth;
   const maxNodes = limits.maxNodes ?? DEFAULT_XML_LIMITS.maxNodes;
   let depth = 0;
@@ -275,16 +275,16 @@ function checkXmlLimits(xml, label5, limits = {}) {
       continue;
     }
     nodes++;
-    if (nodes > maxNodes) throw new Error(`${label5} XML exceeds the limit of ${maxNodes} elements`);
+    if (nodes > maxNodes) throw new Error(`${label2} XML exceeds the limit of ${maxNodes} elements`);
     if (!selfClosing && ++depth > maxDepth)
-      throw new Error(`${label5} XML exceeds the nesting depth limit of ${maxDepth}`);
+      throw new Error(`${label2} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
 function parseXml(xml, options = {}) {
-  const label5 = options.label ?? "OOXML";
+  const label2 = options.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
-    throw new Error(`${label5} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label5, options.limits);
+    throw new Error(`${label2} XML with DTD or entity declarations is not supported`);
+  checkXmlLimits(xml, label2, options.limits);
   let parseError = "";
   let parsed;
   try {
@@ -295,12 +295,12 @@ function parseXml(xml, options = {}) {
     }).parseFromString(xml, "application/xml");
   } catch (error) {
     throw new Error(
-      `Invalid ${label5} XML: ${error instanceof Error ? error.message : String(error)}`,
+      `Invalid ${label2} XML: ${error instanceof Error ? error.message : String(error)}`,
       { cause: error }
     );
   }
   if (parseError || !parsed.documentElement)
-    throw new Error(`Invalid ${label5} XML: ${parseError || "missing root element"}`);
+    throw new Error(`Invalid ${label2} XML: ${parseError || "missing root element"}`);
   return parsed;
 }
 function named(element2, local, ns, lenient = true) {
@@ -944,19 +944,19 @@ var init_opc = __esm({
 
 // xlsx/address.ts
 function columnLabel(col) {
-  let label5 = "";
+  let label2 = "";
   let n = col + 1;
   while (n > 0) {
     const rem = (n - 1) % 26;
-    label5 = String.fromCharCode(65 + rem) + label5;
+    label2 = String.fromCharCode(65 + rem) + label2;
     n = Math.floor((n - 1) / 26);
   }
-  return label5;
+  return label2;
 }
-function columnIndex(label5) {
-  if (!/^[A-Za-z]{1,3}$/.test(label5)) return -1;
+function columnIndex(label2) {
+  if (!/^[A-Za-z]{1,3}$/.test(label2)) return -1;
   let n = 0;
-  for (const ch of label5.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
+  for (const ch of label2.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
   return n - 1;
 }
 function parseAddress(ref) {
@@ -1439,8 +1439,8 @@ function attributeReader(element2) {
     if (direct !== null) return direct;
     const attributes = element2.attributes;
     for (let index2 = 0; index2 < attributes.length; index2++) {
-      const candidate = attributes.item(index2);
-      if (candidate && candidate.localName === name2) return candidate.value;
+      const candidate2 = attributes.item(index2);
+      if (candidate2 && candidate2.localName === name2) return candidate2.value;
     }
     return void 0;
   };
@@ -2631,10 +2631,10 @@ function titleXml(context, title) {
 function labelOptionsXml(context, options) {
   return numberFormatXml(options.numberFormat) + shapePropertiesXml(context, options.spPr) + textBodyXml(context, options.txPr) + valXml("dLblPos", options.position) + valXml("showLegendKey", options.showLegendKey) + valXml("showVal", options.showValue) + valXml("showCatName", options.showCategoryName) + valXml("showSerName", options.showSeriesName) + valXml("showPercent", options.showPercent) + valXml("showBubbleSize", options.showBubbleSize) + (options.separator === void 0 ? "" : textElement("separator", options.separator));
 }
-function labelXml(context, label5) {
+function labelXml(context, label2) {
   return elementXml(
     "dLbl",
-    valXml("idx", label5.index) + valXml("delete", label5.deleted) + layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + labelOptionsXml(context, label5) + raw(context, label5.extLst)
+    valXml("idx", label2.index) + valXml("delete", label2.deleted) + layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + labelOptionsXml(context, label2) + raw(context, label2.extLst)
   );
 }
 function dataLabelsXml(context, labels) {
@@ -2642,7 +2642,7 @@ function dataLabelsXml(context, labels) {
   const leaderLines = labels.leaderLines ? elementXml("leaderLines", shapePropertiesXml(context, labels.leaderLines.spPr)) : "";
   return elementXml(
     "dLbls",
-    labels.labels.map((label5) => labelXml(context, label5)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
+    labels.labels.map((label2) => labelXml(context, label2)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
   );
 }
 var textElement, dataSourceXml;
@@ -2673,12 +2673,12 @@ function dataTableXml(context, table2) {
 }
 function displayUnitsXml(context, units) {
   if (!units) return "";
-  const label5 = units.label;
+  const label2 = units.label;
   return elementXml(
     "dispUnits",
-    valXml("custUnit", units.customUnit) + (units.customUnit === void 0 ? valXml("builtInUnit", units.builtInUnit) : "") + (label5 ? elementXml(
+    valXml("custUnit", units.customUnit) + (units.customUnit === void 0 ? valXml("builtInUnit", units.builtInUnit) : "") + (label2 ? elementXml(
       "dispUnitsLbl",
-      layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr)
+      layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + shapePropertiesXml(context, label2.spPr) + textBodyXml(context, label2.txPr)
     ) : "") + raw(context, units.extLst)
   );
 }
@@ -2889,10 +2889,10 @@ function parseDisplayUnits(context, element2) {
   if (!element2) return void 0;
   reportUnmodelled(context, element2, DISPLAY_UNITS);
   const labelElement = cChild(element2, "dispUnitsLbl");
-  let label5;
+  let label2;
   if (labelElement) {
     reportUnmodelled(context, labelElement, DISPLAY_UNITS_LABEL);
-    label5 = assignDefined(
+    label2 = assignDefined(
       {},
       {
         layout: manualLayout(labelElement),
@@ -2907,7 +2907,7 @@ function parseDisplayUnits(context, element2) {
     {
       builtInUnit: cVal(element2, "builtInUnit"),
       customUnit: cNumber(context, element2, "custUnit"),
-      label: label5,
+      label: label2,
       extLst: extensionList(element2)
     }
   );
@@ -3430,11 +3430,11 @@ var init_write_axes = __esm({
 });
 
 // chart/write-analysis.ts
-function trendlineLabelXml(context, label5) {
-  if (!label5) return "";
+function trendlineLabelXml(context, label2) {
+  if (!label2) return "";
   return elementXml(
     "trendlineLbl",
-    layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + numberFormatXml(label5.numberFormat) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr) + raw(context, label5.extLst)
+    layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + numberFormatXml(label2.numberFormat) + shapePropertiesXml(context, label2.spPr) + textBodyXml(context, label2.txPr) + raw(context, label2.extLst)
   );
 }
 function trendlineXml(context, trendline) {
@@ -7633,7 +7633,7 @@ function serialSeconds(serial) {
   const rounded = rest > 0.5 || rest === 0.5 && whole % 2 === 1 ? whole + 1 : whole;
   return rounded % 86400;
 }
-function daysInMonth(year, month) {
+function daysInMonth2(year, month) {
   return new Date(Date.UTC(year, month, 0)).getUTCDate();
 }
 function localDateToSerial(date, date1904 = date1904Mode) {
@@ -8608,14 +8608,14 @@ function unique(args, ctx) {
   const byCol = args.length > 1 && args[1] !== null && toBool(ctx.toScalar(args[1] ?? null));
   const once = args.length > 2 && args[2] !== null && toBool(ctx.toScalar(args[2] ?? null));
   if (byCol) m = transpose(m);
-  const keyOf2 = (row2) => JSON.stringify(
+  const keyOf3 = (row2) => JSON.stringify(
     row2.map(
       (v) => isError(v) ? `#${v.error}` : typeof v === "string" ? `s${v.toLowerCase()}` : v
     )
   );
   const counts = /* @__PURE__ */ new Map();
   for (const row2 of m.data) {
-    const key = keyOf2(row2);
+    const key = keyOf3(row2);
     const entry3 = counts.get(key);
     if (entry3) entry3.count++;
     else counts.set(key, { row: row2, count: 1 });
@@ -9145,7 +9145,7 @@ function addMonths(serial, months, ctx, endOfMonth) {
   const total2 = year * 12 + (month - 1) + Math.trunc(months);
   const y = Math.floor(total2 / 12);
   const m = total2 % 12 + 1;
-  const d = endOfMonth ? daysInMonth(y, m) : Math.min(day, daysInMonth(y, m));
+  const d = endOfMonth ? daysInMonth2(y, m) : Math.min(day, daysInMonth2(y, m));
   const out = ymdToSerial(y, m, d, ctx.date1904);
   return out === void 0 ? fail(ERR.NUM) : out;
 }
@@ -9212,7 +9212,7 @@ function datedif(start, end, unit, ctx) {
       if (b.day >= a2.day) return b.day - a2.day;
       const pm = b.month === 1 ? 12 : b.month - 1;
       const py = b.month === 1 ? b.year - 1 : b.year;
-      return daysInMonth(py, pm) - a2.day + b.day;
+      return daysInMonth2(py, pm) - a2.day + b.day;
     }
     case "YD": {
       let y = b.year;
@@ -9236,7 +9236,7 @@ function days360(start, end, european, ctx) {
     if (d1 === 31) d1 = 30;
     if (d2 === 31) d2 = 30;
   } else {
-    const lastFeb = (y, m, d) => m === 2 && d === daysInMonth(y, 2);
+    const lastFeb = (y, m, d) => m === 2 && d === daysInMonth2(y, 2);
     if (lastFeb(a2.year, a2.month, d1)) d1 = 30;
     if (d1 === 31) d1 = 30;
     if (d2 === 31 && d1 >= 30) d2 = 30;
@@ -9244,7 +9244,7 @@ function days360(start, end, european, ctx) {
   return (b.year - a2.year) * 360 + (b.month - a2.month) * 30 + (d2 - d1);
 }
 function yearFrac30(a2, b) {
-  const lastFeb = (d) => d.month === 2 && d.day === daysInMonth(d.year, 2);
+  const lastFeb = (d) => d.month === 2 && d.day === daysInMonth2(d.year, 2);
   let d1 = a2.day;
   let d2 = b.day;
   if (d1 === 31 && d2 === 31) {
@@ -10250,7 +10250,7 @@ function couponFacts(settlement, maturity, frequency2, basis, ctx) {
   checkSecurity(s, m, frequency2, basis);
   const months = 12 / frequency2;
   const { year, month, day } = serialToYmd(m, ctx.date1904);
-  const monthEnd = day === daysInMonth(year, month);
+  const monthEnd = day === daysInMonth2(year, month);
   let count2 = 0;
   let next = m;
   let previous = addMonths(m, -months, ctx, monthEnd);
@@ -10423,7 +10423,7 @@ function duration(bond, yld) {
 function quasiPeriods(anchor, from, to, frequency2, ctx) {
   const months = 12 / frequency2;
   const { year, month, day } = serialToYmd(anchor, ctx.date1904);
-  const monthEnd = day === daysInMonth(year, month);
+  const monthEnd = day === daysInMonth2(year, month);
   const at = (k) => addMonths(anchor, k * months, ctx, monthEnd);
   let back = 0;
   while (at(back) > from) back -= 1;
@@ -10677,7 +10677,7 @@ function oddFirstPrice(s, yld, ctx) {
   );
   const toFirst = quasi.fraction(settlement, firstCoupon);
   const { year, month, day } = serialToYmd(firstCoupon, ctx.date1904);
-  const monthEnd = day === daysInMonth(year, month);
+  const monthEnd = day === daysInMonth2(year, month);
   let n = 1;
   while (addMonths(firstCoupon, n * months, ctx, monthEnd) < maturity) n += 1;
   n += 1;
@@ -11888,9 +11888,9 @@ var init_logical = __esm({
           if (isError(target)) return target;
           let i = 1;
           for (; i + 1 < args.length; i += 2) {
-            const candidate = ctx.toScalar(deref(ctx, args[i].get()));
-            if (isError(candidate)) return candidate;
-            if (typeof candidate === typeof target && compareScalars(candidate, target) === 0) {
+            const candidate2 = ctx.toScalar(deref(ctx, args[i].get()));
+            if (isError(candidate2)) return candidate2;
+            if (typeof candidate2 === typeof target && compareScalars(candidate2, target) === 0) {
               return args[i + 1].get();
             }
           }
@@ -16582,6 +16582,13 @@ var init_sparkline_ranges = __esm({
 });
 
 // xlsx/pivot/axes.ts
+function pivotValuesIndex(pivot) {
+  if (pivot.valuesAxis !== "rows") return -1;
+  const count2 = pivotRowFields(pivot).length;
+  const at = pivot.valuesPosition;
+  if (typeof at === "number") return Math.min(Math.max(Math.trunc(at), 0), count2);
+  return at === "first" ? 0 : at === "between" ? Math.min(1, count2) : count2;
+}
 var pivotRowFields, pivotColumnFields;
 var init_axes = __esm({
   "xlsx/pivot/axes.ts"() {
@@ -16597,6 +16604,55 @@ var init_axes = __esm({
   }
 });
 
+// xlsx/pivot/captions.ts
+function pivotCaptions(pivot) {
+  const own = pivot.captions;
+  if (!own) return ENGLISH_PIVOT_CAPTIONS;
+  return {
+    ...ENGLISH_PIVOT_CAPTIONS,
+    ...Object.fromEntries(Object.entries(own).filter(([, value]) => typeof value === "string")),
+    functions: { ...ENGLISH_PIVOT_CAPTIONS.functions, ...own.functions },
+    aggregates: { ...ENGLISH_PIVOT_CAPTIONS.aggregates, ...own.aggregates }
+  };
+}
+var FUNCTIONS, aggregateNames, ENGLISH_PIVOT_CAPTIONS, fillCaption;
+var init_captions = __esm({
+  "xlsx/pivot/captions.ts"() {
+    FUNCTIONS = {
+      sum: "Sum",
+      count: "Count",
+      average: "Average",
+      max: "Max",
+      min: "Min",
+      product: "Product",
+      countNums: "Count",
+      stdDev: "StdDev",
+      stdDevp: "StdDevp",
+      var: "Var",
+      varp: "Varp"
+    };
+    aggregateNames = () => Object.fromEntries(
+      Object.keys(FUNCTIONS).map((fn) => [
+        fn,
+        `${fn[0].toUpperCase()}${fn.slice(1)} of {0}`
+      ])
+    );
+    ENGLISH_PIVOT_CAPTIONS = {
+      rowLabels: "Row Labels",
+      columnLabels: "Column Labels",
+      grandTotal: "Grand Total",
+      values: "Values",
+      all: "(All)",
+      blank: "(blank)",
+      subtotal: "{0} Total",
+      measureTotal: "Total {0}",
+      functions: FUNCTIONS,
+      aggregates: aggregateNames()
+    };
+    fillCaption = (template, ...args) => template.replace(/\{(\d)\}/g, (_match, at) => args[Number(at)] ?? "");
+  }
+});
+
 // xlsx/pivot/date-groups.ts
 function dateGroupRange(group, serials) {
   let min = Infinity;
@@ -16614,7 +16670,7 @@ function dateGroupRange(group, serials) {
 function dayBuckets(range, days) {
   return Math.max(1, Math.ceil((Math.floor(range.end) - Math.floor(range.start) + 1) / days));
 }
-function dateUnitLabels(unit, range, days, date1904) {
+function englishDateUnitLabels(unit, range, days, date1904) {
   const labels = [`<${isoDay(range.start, date1904)}`];
   if (unit === "seconds" || unit === "minutes")
     for (let i = 0; i < 60; i++) labels.push(`:${pad5(i)}`);
@@ -16643,6 +16699,11 @@ function dateUnitLabels(unit, range, days, date1904) {
   labels.push(`>${isoDay(range.end, date1904)}`);
   return labels;
 }
+function dateUnitLabels(unit, range, days, date1904, group) {
+  const english = englishDateUnitLabels(unit, range, days, date1904);
+  const localized = group?.localized?.[unit]?.labels;
+  return localized?.length === english.length ? localized : english;
+}
 function dateUnitIndex(unit, range, days, date1904, serial, count2) {
   if (serial < range.start) return 0;
   if (serial > range.end) return count2 - 1;
@@ -16666,7 +16727,7 @@ function derivedDateFields(pivot) {
   for (const group of pivot.dateGroups ?? [])
     for (const unit of dateGroupUnits(group))
       derived.push({
-        name: dateGroupFieldName(unit, group.field),
+        name: dateGroupFieldName(unit, group.field, group),
         unit,
         group,
         index: databaseFields + derived.length
@@ -16677,7 +16738,7 @@ function countDerived(pivot) {
   let count2 = 0;
   for (const group of pivot.dateGroups ?? [])
     for (const unit of dateGroupUnits(group))
-      if (pivot.fields.includes(dateGroupFieldName(unit, group.field))) count2++;
+      if (pivot.fields.includes(dateGroupFieldName(unit, group.field, group))) count2++;
   return count2;
 }
 function resolveDateGroups(pivot) {
@@ -16689,11 +16750,11 @@ function resolveDateGroups(pivot) {
   });
 }
 function derivedDateLabels(pivot, name2) {
-  const entry3 = derivedDateFields(pivot).find((candidate) => candidate.name === name2);
+  const entry3 = derivedDateFields(pivot).find((candidate2) => candidate2.name === name2);
   if (!entry3) return void 0;
   const [group] = resolveDateGroups({ ...pivot, dateGroups: [entry3.group] });
   const range = { start: group.start, end: group.end };
-  return dateUnitLabels(entry3.unit, range, dateGroupDays(group), pivot.date1904 ?? false);
+  return dateUnitLabels(entry3.unit, range, dateGroupDays(group), pivot.date1904 ?? false, group);
 }
 function validateDateGroups(pivot) {
   const groups = pivot.dateGroups;
@@ -16709,18 +16770,16 @@ function validateDateGroups(pivot) {
     seen.add(group.field);
     if (!(pivot.dateFields ?? []).includes(group.field))
       throw new Error("Only fields that contain dates can be grouped by date.");
-    if (pivot.pageFilter || pivot.dateFilter)
-      throw new Error("Date groups cannot be combined with report filters or timelines.");
     const serials = pivot.records.map((record) => record[index2]);
     if (!serials.length || serials.some((v) => typeof v !== "number" || !Number.isFinite(v)))
       throw new Error("Only fields that contain dates can be grouped by date.");
     const range = dateGroupRange(group, serials);
     if (range.start >= range.end) throw new Error("The date group must end after it starts.");
     for (const unit of dateGroupUnits(group)) {
-      const name2 = dateGroupFieldName(unit, group.field);
+      const name2 = dateGroupFieldName(unit, group.field, group);
       if (pivot.fields.includes(name2))
         throw new Error("A source field already has the name of a date group field.");
-      if (dateUnitLabels(unit, range, dateGroupDays(group), pivot.date1904 ?? false).length > MAX_ITEMS)
+      if (dateUnitLabels(unit, range, dateGroupDays(group), pivot.date1904 ?? false, group).length > MAX_ITEMS)
         throw new Error("The date group has too many items.");
     }
   }
@@ -16734,7 +16793,7 @@ function expandDateGroups(pivot) {
   const tables = derived.map((entry3) => {
     const range = { start: entry3.group.start, end: entry3.group.end };
     const days = dateGroupDays(entry3.group);
-    const labels = dateUnitLabels(entry3.unit, range, days, date1904);
+    const labels = dateUnitLabels(entry3.unit, range, days, date1904, entry3.group);
     return {
       base: pivot.fields.indexOf(entry3.group.field),
       labels,
@@ -16780,7 +16839,7 @@ var init_date_groups = __esm({
     MAX_ITEMS = 1e4;
     pad5 = (value, width = 2) => String(value).padStart(width, "0");
     dateGroupUnits = (group) => PIVOT_DATE_UNITS.filter((unit) => group.by.includes(unit));
-    dateGroupFieldName = (unit, field) => `${UNIT_TITLES[unit]} (${field})`;
+    dateGroupFieldName = (unit, field, group) => group?.localized?.[unit]?.name ?? `${UNIT_TITLES[unit]} (${field})`;
     dateGroupDays = (group) => group.by.length === 1 && group.by[0] === "days" ? group.days ?? 1 : 1;
     isoDay = (serial, date1904) => {
       const { year, month, day } = serialToYmd(serial, date1904);
@@ -16878,15 +16937,13 @@ function fieldSubtotalFunctions(pivot, field) {
   if (entry3) return PIVOT_SUBTOTAL_ORDER.filter((fn) => entry3.functions.includes(fn));
   return field === pivot.rowField && pivot.subtotals === false ? [] : "auto";
 }
-function validateFieldSubtotals(pivot, rowFields) {
+function validateFieldSubtotals(pivot, axisFields) {
   const entries = pivot.fieldSubtotals;
   if (entries === void 0) return;
   if (!Array.isArray(entries)) throw new Error("Choose valid field subtotals.");
-  if (entries.length && pivot.valuesAxis === "rows")
-    throw new Error("Field subtotals require Values on columns.");
   const seen = /* @__PURE__ */ new Set();
   for (const entry3 of entries) {
-    if (!entry3 || typeof entry3 !== "object" || !rowFields.includes(entry3.field) || seen.has(entry3.field) || !Array.isArray(entry3.functions) || entry3.functions.some((fn) => !PIVOT_AGGREGATES.includes(fn)) || new Set(entry3.functions).size !== entry3.functions.length)
+    if (!entry3 || typeof entry3 !== "object" || !axisFields.includes(entry3.field) || seen.has(entry3.field) || !Array.isArray(entry3.functions) || entry3.functions.some((fn) => !PIVOT_AGGREGATES.includes(fn)) || new Set(entry3.functions).size !== entry3.functions.length)
       throw new Error("Choose valid field subtotals.");
     seen.add(entry3.field);
   }
@@ -16991,6 +17048,24 @@ var init_item_filters = __esm({
   }
 });
 
+// xlsx/pivot/item-labels.ts
+function pivotItemLabeler(pivot) {
+  const blank = pivotCaptions(pivot).blank;
+  const names2 = pivot.itemNames?.length ? new Map(pivot.itemNames.map((entry3) => [keyOf(entry3.field, entry3.item), entry3.name])) : void 0;
+  return (field, value) => names2?.get(keyOf(field, value)) ?? (value === null || value === "" ? blank : pivotItemLabel(value));
+}
+var keyOf, pivotItemName;
+var init_item_labels = __esm({
+  "xlsx/pivot/item-labels.ts"() {
+    init_captions();
+    init_data();
+    keyOf = (field, item) => `${field}\0${pivotValueKey(item)}`;
+    pivotItemName = (pivot, field, item) => pivot.itemNames?.find(
+      (entry3) => entry3.field === field && pivotValueKey(entry3.item) === pivotValueKey(item)
+    )?.name;
+  }
+});
+
 // xlsx/pivot/page-filter.ts
 function validatePivotPageFilter(pivot) {
   const filter2 = pivot.pageFilter;
@@ -17002,23 +17077,24 @@ function validatePivotPageFilter(pivot) {
     pivot.columnField,
     pivot.valueField,
     ...extras.map((v) => v?.field)
-  ].includes(filter2.field) || pivot.valuesAxis === "rows")
-    throw new Error("Report filters require Values on columns and a separate source field.");
+  ].includes(filter2.field))
+    throw new Error("Report filters require a separate source field.");
   if (filter2.item !== void 0 && !(filter2.item === null || typeof filter2.item === "string" || typeof filter2.item === "boolean" || typeof filter2.item === "number" && Number.isFinite(filter2.item) || isCellError(filter2.item) && isErrorCode(filter2.item.error) && Object.keys(filter2.item).length === 1))
     throw new Error("Choose a cached literal report filter item.");
 }
 function pivotPageProjection(pivot) {
-  return applyPivotGroups(applyPivotItemFilters(pagedProjection(pivot)));
+  const groups = pivot.dateGroups?.length ? { ...pivot, dateGroups: resolveDateGroups(pivot) } : pivot;
+  return applyPivotGroups(applyPivotItemFilters(pagedProjection(groups)));
 }
 function pagedProjection(pivot) {
   const filter2 = pivot.pageFilter;
   if (!filter2) return pivot;
   const labels = /* @__PURE__ */ new Map();
   for (const item of pivotItems(pivot, filter2.field)) {
-    const label5 = String(pivotItemLabel(item)).toLowerCase(), key2 = pivotValueKey(item);
-    if (label5 === "(all)" || labels.has(label5) && labels.get(label5) !== key2)
+    const label2 = String(pivotItemLabel(item)).toLowerCase(), key2 = pivotValueKey(item);
+    if (label2 === "(all)" || labels.has(label2) && labels.get(label2) !== key2)
       throw new Error("Ambiguous report filter item captions are preserved.");
-    labels.set(label5, key2);
+    labels.set(label2, key2);
   }
   if (filter2.item === void 0) return pivot;
   const index2 = pivot.fields.indexOf(filter2.field), key = pivotValueKey(filter2.item);
@@ -17036,7 +17112,7 @@ function prependPivotPage(grid, pivot) {
     values: [
       [
         pivot.pageFilter.field,
-        pivot.pageFilter.item === void 0 ? "(All)" : pivotItemLabel(pivot.pageFilter.item),
+        pivot.pageFilter.item === void 0 ? pivotCaptions(pivot).all : pivotItemLabeler(pivot)(pivot.pageFilter.field, pivot.pageFilter.item),
         ...Array(width - 2).fill(null)
       ],
       Array(width).fill(null),
@@ -17051,6 +17127,9 @@ var init_page_filter = __esm({
   "xlsx/pivot/page-filter.ts"() {
     init_model();
     init_data();
+    init_item_labels();
+    init_captions();
+    init_date_groups();
     init_groups();
     init_item_filters();
   }
@@ -17092,13 +17171,9 @@ function validatePivotFields(pivot) {
   const columns = pivotColumnFields(pivot);
   if (pivot.moreColumnFields !== void 0 && (!Array.isArray(pivot.moreColumnFields) || pivot.moreColumnFields.length > 0 && !pivot.columnField || pivot.moreColumnFields.length > 62 || pivot.moreColumnFields.some((name2) => typeof name2 !== "string")))
     throw new Error("Choose valid PivotTable column fields.");
-  if (pivot.valuesAxis === "rows" && rows.length > 2)
-    throw new Error("Values on rows support at most two row fields.");
-  if (pivot.valuesAxis === "rows" && columns.length > 1)
-    throw new Error("Values on rows support one column field.");
   if (pivot.pageFilter && columns.length > 1)
     throw new Error("Report filters support one column field.");
-  validateFieldSubtotals(pivot, rows);
+  validateFieldSubtotals(pivot, [...rows, ...columns]);
   const axisNames = pivotAxisFieldNames(pivot);
   if ((pivot.dateGroups ?? []).some(
     (group) => [...rows, ...columns].some((name2) => name2 === group.field)
@@ -17107,13 +17182,14 @@ function validatePivotFields(pivot) {
   const extras = pivot.additionalValues ?? [];
   if (pivot.valuesAxis !== void 0 && !["columns", "rows"].includes(pivot.valuesAxis))
     throw new Error("Choose a valid Values axis.");
-  if (pivot.valuesPosition !== void 0 && !["last", "between", "first"].includes(pivot.valuesPosition))
+  const position = pivot.valuesPosition;
+  if (position !== void 0 && !["last", "between", "first"].includes(position) && !(typeof position === "number" && Number.isInteger(position) && position >= 0))
     throw new Error("Choose a valid Values position.");
-  if ((pivot.valuesPosition === "between" || pivot.valuesPosition === "first") && (pivot.valuesAxis !== "rows" || !pivot.secondRowField))
+  if (position !== void 0 && position !== "last" && (pivot.valuesAxis !== "rows" || position === "between" && !pivot.secondRowField || typeof position === "number" && position > rows.length))
     throw new Error("Values before or between fields require two row fields and Values on rows.");
   if (pivot.valuesAxis === "rows" && (!Array.isArray(extras) || !extras.length))
     throw new Error("Values on rows require multiple measures.");
-  if (extras.length > 0 && pivot.sourceXml && parseXml(pivot.sourceXml).documentElement.getAttribute("dataCaption") !== "Values")
+  if (extras.length > 0 && pivot.sourceXml && parseXml(pivot.sourceXml).documentElement.getAttribute("dataCaption") !== pivotCaptions(pivot).values)
     throw new Error("This PivotTable uses unsupported Values header captions.");
   if (!Array.isArray(extras) || extras.length > 15 || extras.some(
     (measure) => !measure || !pivot.fields.includes(measure.field) || !PIVOT_AGGREGATES.includes(measure.aggregate) || typeof measure.caption !== "string" || !measure.caption.trim() || measure.caption.length > 255 || pivot.fields.some((field) => field.toLowerCase() === measure.caption.toLowerCase())
@@ -17132,6 +17208,7 @@ var init_data = __esm({
     init_model();
     init_xml2();
     init_axes();
+    init_captions();
     init_date_groups();
     init_groups();
     init_subtotals();
@@ -17180,24 +17257,7 @@ function aggregateValues(records, field, type) {
   const sum3 = numbers3.reduce((total2, value) => total2 + value, 0);
   return type === "average" ? sum3 / numbers3.length : sum3;
 }
-function pivotHeaderDimensions(pivot, columnItems, rowLabels) {
-  return {
-    rows: (pivot.columnField ? 2 : 1) + (pivot.pageFilter ? 2 : 0),
-    width: rowLabels + (pivot.columnField ? columnItems + 1 : 1)
-  };
-}
-function pivotHeaders(pivot, columns, labels, label5) {
-  const rowLabels = pivot.layout === "compact" ? ["Row Labels"] : pivot.valuesPosition === "first" ? ["Values", ...labels] : pivot.valuesPosition === "between" ? [labels[0], "Values", labels[1]] : [...labels, "Values"];
-  return pivot.columnField ? [
-    [
-      ...rowLabels.map(() => null),
-      pivot.layout === "compact" ? "Column Labels" : pivot.columnField,
-      ...columns.map(() => null)
-    ],
-    [...rowLabels, ...columns.map(label5), "Grand Total"]
-  ] : [[...rowLabels, null]];
-}
-var pivotMeasures, DIV0, pivotMeasureNumber, pivotNumbers;
+var pivotMeasures, DIV0, pivotMeasureNumber;
 var init_measures = __esm({
   "xlsx/pivot/measures.ts"() {
     init_model();
@@ -17207,277 +17267,6 @@ var init_measures = __esm({
     ];
     DIV0 = { error: "#DIV/0!" };
     pivotMeasureNumber = (pivot, records, measure) => aggregateValues(records, pivot.fields.indexOf(measure.field), measure.aggregate);
-    pivotNumbers = (pivot, records) => pivotMeasures(pivot).map((measure) => pivotMeasureNumber(pivot, records, measure));
-  }
-});
-
-// xlsx/pivot/hierarchy-first.ts
-function appendFirstPivotValues(pivot, context) {
-  const {
-    rowItems,
-    secondRowItems,
-    columnItems,
-    children: children2,
-    innerIndices,
-    groups,
-    details,
-    buckets,
-    width,
-    rowLabels,
-    top,
-    bottom,
-    append
-  } = context;
-  const compact = pivot.layout === "compact";
-  const tabular = !pivot.layout || pivot.layout === "tabular";
-  const blank = () => Array(width - rowLabels).fill(null);
-  pivotMeasures(pivot).forEach((measure, m) => {
-    const numbers3 = (keys, records) => [
-      ...columnItems.map(
-        (column2) => pivotMeasureNumber(
-          pivot,
-          buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-          measure
-        )
-      ),
-      pivotMeasureNumber(pivot, records, measure)
-    ];
-    if (!tabular)
-      append([measure.caption, ...Array(rowLabels - 1).fill(null)], blank(), {
-        indices: [m],
-        measure: m
-      });
-    let first2 = true;
-    rowItems.forEach((outer, outerIndex) => {
-      const key = pivotValueKey(outer);
-      const group = groups.get(key) ?? [];
-      if (!tabular)
-        append(
-          compact ? [pivotItemLabel(outer)] : [null, pivotItemLabel(outer), null],
-          top ? numbers3([key], group) : blank(),
-          { indices: [m, outerIndex], measure: m },
-          compact ? 1 : 0
-        );
-      const innerKeys = [...children2.get(key)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      innerKeys.forEach((innerKey, child3) => {
-        const innerIndex = innerIndices.get(innerKey);
-        append(
-          compact ? [pivotItemLabel(secondRowItems[innerIndex])] : [
-            tabular && first2 ? measure.caption : null,
-            pivot.repeatLabels || tabular && child3 === 0 ? pivotItemLabel(outer) : null,
-            pivotItemLabel(secondRowItems[innerIndex])
-          ],
-          numbers3([key, innerKey], details.get(JSON.stringify([key, innerKey]))),
-          { indices: [m, outerIndex, innerIndex], measure: m },
-          compact ? 2 : 0
-        );
-        first2 = false;
-      });
-      if (bottom)
-        append(
-          compact ? [`${String(pivotItemLabel(outer))} Total`] : [null, `${String(pivotItemLabel(outer))} Total`, null],
-          numbers3([key], group),
-          { indices: [m, outerIndex], measure: m, type: "default" },
-          compact ? 1 : 0
-        );
-    });
-  });
-}
-var init_hierarchy_first = __esm({
-  "xlsx/pivot/hierarchy-first.ts"() {
-    init_data();
-    init_measures();
-  }
-});
-
-// xlsx/pivot/hierarchy.ts
-function hierarchicalPivotGrid(pivot) {
-  const rowItems = pivotItems(pivot, pivot.rowField);
-  const secondRowItems = pivotItems(pivot, pivot.secondRowField);
-  const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  const outerField = pivot.fields.indexOf(pivot.rowField);
-  const innerField = pivot.fields.indexOf(pivot.secondRowField);
-  const columnField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const layout2 = pivot.layout ?? "tabular";
-  const compact = layout2 === "compact";
-  const firstValues = pivot.valuesPosition === "first";
-  const between = pivot.valuesPosition === "between";
-  const measures = pivotMeasures(pivot);
-  const top = firstValues && layout2 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
-  const bottom = pivot.subtotals !== false && !top;
-  const rowLabelColumns = compact ? 1 : 3;
-  const groups = /* @__PURE__ */ new Map();
-  const details = /* @__PURE__ */ new Map();
-  const children2 = /* @__PURE__ */ new Map();
-  const innerIndices = new Map(secondRowItems.map((item, index2) => [pivotValueKey(item), index2]));
-  const buckets = /* @__PURE__ */ new Map();
-  const collect = (map, key, record) => {
-    const list = map.get(key);
-    if (list) list.push(record);
-    else map.set(key, [record]);
-  };
-  for (const record of pivot.records) {
-    const outer = pivotValueKey(record[outerField] ?? null);
-    const inner = pivotValueKey(record[innerField] ?? null);
-    collect(groups, outer, record);
-    collect(details, JSON.stringify([outer, inner]), record);
-    if (!children2.has(outer)) children2.set(outer, /* @__PURE__ */ new Set());
-    children2.get(outer).add(inner);
-    if (pivot.columnField) {
-      const column2 = pivotValueKey(record[columnField] ?? null);
-      for (const key of [[], [outer], [outer, inner]])
-        collect(buckets, JSON.stringify([...key, column2]), record);
-    }
-  }
-  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, rowLabelColumns);
-  const rows = (details.size + rowItems.length * Number(bottom) + 1) * measures.length + rowItems.length * Number(layout2 !== "tabular") * (firstValues ? measures.length : 1) + (firstValues ? measures.length : between ? rowItems.length * measures.length : details.size) * Number(layout2 !== "tabular") + dimensions.rows;
-  if (rows * dimensions.width > 1e6) throw new Error("The PivotTable result is too large.");
-  const labels = compact ? ["Row Labels"] : [pivot.rowField, pivot.secondRowField];
-  const values2 = pivotHeaders(pivot, columnItems, labels, label2);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
-  const rowEntries = [];
-  const append = (labels2, numbers4, entry3, indent = 0) => {
-    values2.push([...labels2, ...numbers4]);
-    rowEntries.push(entry3);
-    indents.push(indent);
-  };
-  const bands = (keys, records) => [
-    ...columnItems.map(
-      (column2) => pivotNumbers(pivot, buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [])
-    ),
-    pivotNumbers(pivot, records)
-  ];
-  const numbers3 = (keys, records) => bands(keys, records).flat();
-  const appendMeasures = (labels2, keys, records, indices, type) => {
-    const values3 = bands(keys, records);
-    measures.forEach(
-      (measure, m) => append(
-        type ? [
-          `${type === "grand" ? "Total" : String(labels2[0])} ${measure.caption}`,
-          ...Array(rowLabelColumns - 1).fill(null)
-        ] : compact ? [measure.caption] : [
-          ...labels2.map(
-            (label5) => layout2 === "tabular" && m === 0 || pivot.repeatLabels ? label5 : null
-          ),
-          measure.caption
-        ],
-        values3.map((band) => band[m] ?? null),
-        { indices: type ? indices : [...indices, m], measure: m, ...type ? { type } : {} },
-        compact && !type ? 2 : 0
-      )
-    );
-  };
-  if (firstValues)
-    appendFirstPivotValues(pivot, {
-      rowItems,
-      secondRowItems,
-      columnItems,
-      children: children2,
-      innerIndices,
-      groups,
-      details,
-      buckets,
-      width: dimensions.width,
-      rowLabels: rowLabelColumns,
-      top,
-      bottom,
-      append
-    });
-  else
-    rowItems.forEach((outer, outerIndex) => {
-      const key = pivotValueKey(outer);
-      if (layout2 !== "tabular")
-        append(
-          [label2(outer), ...Array(rowLabelColumns - 1).fill(null)],
-          top ? numbers3([key], groups.get(key) ?? []) : Array(dimensions.width - rowLabelColumns).fill(null),
-          { indices: [outerIndex] }
-        );
-      let first2 = true;
-      const innerKeys = [...children2.get(key)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      if (between)
-        measures.forEach((measure, m) => {
-          if (layout2 !== "tabular")
-            append(
-              compact ? [measure.caption] : [pivot.repeatLabels ? label2(outer) : null, measure.caption, null],
-              Array(dimensions.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, m], measure: m },
-              compact ? 1 : 0
-            );
-          innerKeys.forEach((innerKey, child3) => {
-            const innerIndex = innerIndices.get(innerKey);
-            const keys = [key, innerKey];
-            const records = details.get(JSON.stringify(keys));
-            append(
-              compact ? [label2(secondRowItems[innerIndex])] : [
-                pivot.repeatLabels || layout2 === "tabular" && m === 0 && child3 === 0 ? label2(outer) : null,
-                layout2 === "tabular" && child3 === 0 ? measure.caption : null,
-                label2(secondRowItems[innerIndex])
-              ],
-              [
-                ...columnItems.map(
-                  (column2) => pivotMeasureNumber(
-                    pivot,
-                    buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-                    measure
-                  )
-                ),
-                pivotMeasureNumber(pivot, records, measure)
-              ],
-              { indices: [outerIndex, m, innerIndex], measure: m },
-              compact ? 2 : 0
-            );
-          });
-        });
-      else
-        innerKeys.forEach((innerKey) => {
-          const innerIndex = innerIndices.get(innerKey);
-          const inner = secondRowItems[innerIndex];
-          const keys = [key, innerKey];
-          const records = details.get(JSON.stringify(keys));
-          if (!records) return;
-          if (layout2 !== "tabular")
-            append(
-              compact ? [label2(inner)] : [pivot.repeatLabels ? label2(outer) : null, label2(inner), null],
-              Array(dimensions.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, innerIndex] },
-              compact ? 1 : 0
-            );
-          appendMeasures(
-            [pivot.repeatLabels || first2 ? label2(outer) : null, label2(inner)],
-            keys,
-            records,
-            [outerIndex, innerIndex]
-          );
-          first2 = false;
-        });
-      if (bottom)
-        appendMeasures([label2(outer)], [key], groups.get(key) ?? [], [outerIndex], "default");
-    });
-  appendMeasures([], [], pivot.records, [0], "grand");
-  return {
-    values: values2,
-    rowItems,
-    secondRowItems,
-    columnItems,
-    rowEntries,
-    firstDataRow,
-    rowLabelColumns,
-    indents,
-    firstHeaderRow: 1
-  };
-}
-var label2;
-var init_hierarchy = __esm({
-  "xlsx/pivot/hierarchy.ts"() {
-    init_data();
-    init_hierarchy_first();
-    init_measures();
-    label2 = pivotItemLabel;
   }
 });
 
@@ -17486,6 +17275,7 @@ function pivotColumnEntries(pivot) {
   const names2 = pivotColumnFields(pivot);
   const items = names2.map((name2) => pivotItems(pivot, name2));
   const entries = [];
+  const functions = names2.map((name2) => fieldSubtotalFunctions(pivot, name2));
   if (names2.length) {
     const order = items.map(
       (list) => new Map(list.map((item, index2) => [pivotValueKey(item), index2]))
@@ -17520,7 +17310,9 @@ function pivotColumnEntries(pivot) {
         if (level === names2.length - 1) entries.push({ kind: "leaf", ...entry3 });
         else {
           visit(child3[1], level + 1, here.path, here.values, here.keys);
-          entries.push({ kind: "subtotal", ...entry3 });
+          const own = functions[level];
+          if (own === "auto") entries.push({ kind: "subtotal", ...entry3 });
+          else for (const fn of own) entries.push({ kind: "subtotal", ...entry3, fn });
         }
       }
     };
@@ -17529,26 +17321,31 @@ function pivotColumnEntries(pivot) {
   entries.push({ kind: "grand", path: [], key: "", values: [] });
   return { names: names2, items, entries };
 }
-function pivotColumnDimensions(pivot, columns, labelColumns) {
-  const measures = 1 + (pivot.additionalValues?.length ?? 0);
+function pivotColumnDimensions(pivot, columns, labelColumns, valuesOnRows = false) {
+  const measures = valuesOnRows ? 1 : 1 + (pivot.additionalValues?.length ?? 0);
   const levels = columns.names.length;
   return {
     rows: (levels ? levels + 1 + Number(measures > 1) : 1) + (pivot.pageFilter ? 2 : 0),
     width: labelColumns + (levels ? columns.entries.length : 1) * measures
   };
 }
-function pivotColumnHeaders(pivot, columns, rowLabels) {
-  const measures = pivotMeasures(pivot);
+function pivotColumnHeaders(pivot, columns, rowLabels, valuesOnRows = false) {
+  const measures = valuesOnRows ? pivotMeasures(pivot).slice(0, 1) : pivotMeasures(pivot);
   const count2 = measures.length;
   const levels = columns.names.length;
-  if (!levels) return [[...rowLabels, ...measures.map((measure) => measure.caption)]];
+  if (!levels)
+    return [
+      [...rowLabels, ...valuesOnRows ? [null] : measures.map((measure) => measure.caption)]
+    ];
   const compact = pivot.layout === "compact";
   const labelColumns = rowLabels.length;
   const width = labelColumns + columns.entries.length * count2;
   const rows = levels + 1 + Number(count2 > 1);
   const grid = Array.from({ length: rows }, () => Array(width).fill(null));
-  if (count2 === 1) grid[0][0] = pivot.valueCaption;
-  const titles = compact ? ["Column Labels"] : [...columns.names, ...count2 > 1 ? ["Values"] : []];
+  if (count2 === 1 && !valuesOnRows) grid[0][0] = pivot.valueCaption;
+  const caps = pivotCaptions(pivot);
+  const labelOf = pivotItemLabeler(pivot);
+  const titles = compact ? [caps.columnLabels] : [...columns.names, ...count2 > 1 ? [caps.values] : []];
   titles.forEach((title, i) => {
     grid[0][labelColumns + i] = title;
   });
@@ -17561,16 +17358,17 @@ function pivotColumnHeaders(pivot, columns, rowLabels) {
     if (entry3.kind === "leaf") {
       entry3.path.forEach((_index, level) => {
         const continued = entry3.path.slice(0, level + 1).every((p, i) => p === previous[i]);
-        if (!continued) grid[1 + level][at] = label3(entry3.values[level]);
+        if (!continued) grid[1 + level][at] = labelOf(columns.names[level], entry3.values[level]);
       });
       previous = entry3.path;
       if (count2 > 1) measures.forEach((measure, m) => grid[rows - 1][at + m] = measure.caption);
       return;
     }
     const row2 = entry3.kind === "grand" ? 1 : entry3.path.length;
-    const name2 = entry3.kind === "grand" ? "" : String(label3(entry3.values.at(-1)));
+    const name2 = entry3.kind === "grand" ? "" : String(labelOf(columns.names[entry3.path.length - 1], entry3.values.at(-1)));
     measures.forEach((measure, m) => {
-      grid[row2][at + m] = count2 === 1 ? entry3.kind === "grand" ? "Grand Total" : `${name2} Total` : entry3.kind === "grand" ? `Total ${measure.caption}` : `${name2} ${measure.caption}`;
+      const custom = entry3.fn ? caps.functions[entry3.fn] : void 0;
+      grid[row2][at + m] = custom ? count2 === 1 ? `${name2} ${custom}` : `${name2} ${custom} of ${measure.field}` : count2 === 1 ? entry3.kind === "grand" ? caps.grandTotal : fillCaption(caps.subtotal, name2) : entry3.kind === "grand" ? fillCaption(caps.measureTotal, measure.caption) : `${name2} ${measure.caption}`;
     });
   });
   return grid;
@@ -17595,20 +17393,22 @@ function pivotColumnItemsXml(entries, measures, remap) {
       const prefix = sharedPrefix(path2, previous);
       const xs = path2.slice(prefix).map((index2) => `<x${attrs({ v: index2 || void 0 })}/>`);
       out.push(
-        `<i${attrs({ t: entry3.kind === "subtotal" ? "default" : void 0, r: prefix || void 0, i: m || void 0 })}>${xs.join("")}</i>`
+        `<i${attrs({ t: entry3.kind === "subtotal" ? entry3.fn ? PIVOT_SUBTOTALS[entry3.fn].item : "default" : void 0, r: prefix || void 0, i: m || void 0 })}>${xs.join("")}</i>`
       );
       previous = path2;
     }
   return `<colItems count="${out.length}">${out.join("")}</colItems>`;
 }
-var SEPARATOR, label3, columnKey, recordColumnKeys;
+var SEPARATOR, columnKey, recordColumnKeys;
 var init_columns = __esm({
   "xlsx/pivot/columns.ts"() {
     init_xml_out();
     init_data();
+    init_item_labels();
+    init_captions();
     init_measures();
+    init_subtotals();
     SEPARATOR = "
";
-    label3 = pivotItemLabel;
     columnKey = (keys, depth) => keys.slice(0, depth).join(SEPARATOR);
     recordColumnKeys = (record, indices) => indices.map((index2) => pivotValueKey(record[index2] ?? null));
   }
@@ -17618,6 +17418,10 @@ var init_columns = __esm({
 function nestedPivotGrid(pivot) {
   const names2 = pivotRowFields(pivot);
   const depth = names2.length;
+  const valuesAt = pivotValuesIndex(pivot);
+  const onRows = valuesAt >= 0;
+  const levels = depth + (onRows ? 1 : 0);
+  const fieldOf = (level) => !onRows || level < valuesAt ? level : level === valuesAt ? -1 : level - 1;
   const axisItems = names2.map((name2) => pivotItems(pivot, name2));
   const itemIndices = axisItems.map(
     (items) => new Map(items.map((item, index2) => [pivotValueKey(item), index2]))
@@ -17629,125 +17433,170 @@ function nestedPivotGrid(pivot) {
   const compact = layout2 === "compact";
   const tabular = layout2 === "tabular";
   const above = !tabular && (pivot.subtotalPosition ?? "top") === "top";
-  const labelColumns = compact ? 1 : depth;
+  const labelColumns = compact ? 1 : levels;
   const measures = pivotMeasures(pivot);
+  const functions = names2.map((name2) => fieldSubtotalFunctions(pivot, name2));
+  const caps = pivotCaptions(pivot);
+  const labelOf = pivotItemLabeler(pivot);
   const root = node(0, null);
   for (const record of pivot.records) {
     const keys = recordColumnKeys(record, columnFields);
     let current = root;
-    for (let level = -1; level < depth; level++) {
-      if (level >= 0) {
-        const value = record[fieldIndices[level]] ?? null;
+    for (let field = -1; field < depth; field++) {
+      if (field >= 0) {
+        const value = record[fieldIndices[field]] ?? null;
         const key = pivotValueKey(value);
         let child3 = current.children.get(key);
         if (!child3) {
-          child3 = node(itemIndices[level].get(key), value);
+          child3 = node(itemIndices[field].get(key), value);
           current.children.set(key, child3);
         }
         current = child3;
       }
       current.records.push(record);
-      for (let width = 1; width <= keys.length; width++) {
-        const key = columnKey(keys, width);
+      for (let width2 = 1; width2 <= keys.length; width2++) {
+        const key = columnKey(keys, width2);
         const list = current.columns.get(key);
         if (list) list.push(record);
         else current.columns.set(key, [record]);
       }
     }
   }
-  const dimensions = pivotColumnDimensions(pivot, columns, labelColumns);
-  const functions = names2.map((name2) => fieldSubtotalFunctions(pivot, name2));
-  let rows = 1;
-  const count2 = (parent, level) => {
-    for (const child3 of parent.children.values()) {
-      rows++;
-      if (level < depth - 1) {
-        const f = functions[level];
-        rows += f === "auto" ? 1 : f.length;
-        count2(child3, level + 1);
-      }
-    }
-  };
-  count2(root, 0);
-  if ((rows + dimensions.rows) * dimensions.width > MAX_CELLS)
-    throw new Error("The PivotTable result is too large.");
-  const values2 = pivotColumnHeaders(pivot, columns, compact ? ["Row Labels"] : names2);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
+  const dimensions = pivotColumnDimensions(pivot, columns, labelColumns, onRows);
+  const rowTitles = names2.map((name2) => name2);
+  if (onRows) rowTitles.splice(valuesAt, 0, caps.values);
+  let values2 = [];
+  let indents = [];
   const rowEntries = [];
-  const blanks = () => Array(dimensions.width - labelColumns).fill(null);
-  const bands = (group, run2) => columns.entries.flatMap(
-    (entry3) => run2(entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [])
-  );
-  const numbers3 = (group) => bands(group, (records) => pivotNumbers(pivot, records));
-  const subtotalNumbers = (group, fn) => bands(
-    group,
-    (records) => measures.map((measure) => aggregateValues(records, pivot.fields.indexOf(measure.field), fn))
-  );
-  const labelCells = (path2, shown, text2) => {
+  let counting = true;
+  let rowCount = 0;
+  const width = dimensions.width - labelColumns;
+  const blanks = () => Array(width).fill(null);
+  const cells2 = (group, rowFn, measure) => columns.entries.flatMap((entry3) => {
+    const records = entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [];
+    const picked = measure === void 0 ? measures : [measures[measure]];
+    if (rowFn && entry3.fn && rowFn !== entry3.fn) return picked.map(() => null);
+    const fn = rowFn ?? entry3.fn;
+    return picked.map(
+      (one2) => fn ? aggregateValues(records, pivot.fields.indexOf(one2.field), fn) : pivotMeasureNumber(pivot, records, one2)
+    );
+  });
+  const labelCells = (path2, shown, level, text2) => {
     if (compact) return [text2];
-    const cells2 = Array(depth).fill(null);
-    path2.forEach((value, level) => {
-      if (shown[level]) cells2[level] = label4(value);
+    const row2 = Array(levels).fill(null);
+    path2.labels.forEach((value, at) => {
+      if (shown[at]) row2[at] = value;
     });
-    cells2[path2.length] = text2;
-    return cells2;
+    row2[level] = text2;
+    return row2;
   };
-  const push = (cells2, numbersOnRow, entry3, indent) => {
-    values2.push([...cells2, ...numbersOnRow]);
+  const push = (indent, build2) => {
+    if (counting) {
+      if ((++rowCount + dimensions.rows) * dimensions.width > MAX_CELLS)
+        throw new Error("The PivotTable result is too large.");
+      return;
+    }
+    const [cells3, numbers3, entry3] = build2();
+    values2.push([...cells3, ...numbers3]);
     rowEntries.push(entry3);
     indents.push(compact ? indent : 0);
   };
-  const emit = (parent, level, path2, indices, firsts) => {
-    const last = level === depth - 1;
-    const own = functions[level];
-    const children2 = [...parent.children.values()].sort((a2, b) => a2.index - b.index);
+  const entryOf = (indices, measure, type) => ({
+    indices,
+    ...measure !== void 0 ? { measure } : {},
+    ...type ? { type } : {}
+  });
+  const walk = (level, group, measure, path2) => {
+    const field = fieldOf(level);
+    const last = level === levels - 1;
+    const repeated = Array.from(
+      { length: level },
+      (_v, k) => !!pivot.repeatLabels && fieldOf(k) >= 0
+    );
+    const leafShown = (firsts) => repeated.map((repeat, k) => repeat || tabular && firsts.slice(k + 1).every(Boolean));
+    if (field < 0) {
+      measures.forEach((one2, m) => {
+        const here = {
+          labels: [...path2.labels, one2.caption],
+          indices: [...path2.indices, m],
+          firsts: [...path2.firsts, m === 0]
+        };
+        if (last)
+          return push(level, () => [
+            labelCells(path2, leafShown(here.firsts), level, one2.caption),
+            cells2(group, void 0, m),
+            entryOf(here.indices, m)
+          ]);
+        if (!tabular)
+          push(level, () => [
+            labelCells(path2, repeated, level, one2.caption),
+            blanks(),
+            entryOf(here.indices, m)
+          ]);
+        walk(level + 1, group, m, here);
+      });
+      return;
+    }
+    const own = functions[field];
+    const valuesAbove = !onRows || valuesAt < level;
+    const showsValue = above && own === "auto" && valuesAbove;
+    const children2 = [...group.children.values()].sort((a2, b) => a2.index - b.index);
     children2.forEach((child3, position) => {
-      const here = [...path2, child3.value];
-      const at = [...indices, child3.index];
-      const firstHere = [...firsts, position === 0];
-      const repeated = Array(level).fill(!!pivot.repeatLabels);
-      if (last) {
-        const shown = repeated.map(
-          (repeat, k) => repeat || tabular && firstHere.slice(k + 1).every(Boolean)
-        );
-        push(labelCells(path2, shown, label4(child3.value)), numbers3(child3), { indices: at }, level);
-        return;
-      }
+      const here = {
+        labels: [...path2.labels, labelOf(names2[field], child3.value)],
+        indices: [...path2.indices, child3.index],
+        firsts: [...path2.firsts, position === 0]
+      };
+      const text2 = labelOf(names2[field], child3.value);
+      if (last)
+        return push(level, () => [
+          labelCells(path2, leafShown(here.firsts), level, text2),
+          cells2(child3, void 0, measure),
+          entryOf(here.indices, measure)
+        ]);
       if (!tabular)
-        push(
-          labelCells(path2, repeated, label4(child3.value)),
-          own === "auto" && above ? numbers3(child3) : blanks(),
-          { indices: at },
-          level
-        );
-      emit(child3, level + 1, here, at, firstHere);
-      const caption = String(label4(child3.value));
+        push(level, () => [
+          labelCells(path2, repeated, level, text2),
+          showsValue ? cells2(child3, void 0, measure) : blanks(),
+          entryOf(here.indices, measure)
+        ]);
+      walk(level + 1, child3, measure, here);
+      if (field === depth - 1) return;
+      const caption = String(text2);
+      const subtotal = (title, fn, one2) => push(level, () => [
+        labelCells(path2, repeated, level, title),
+        cells2(child3, fn, one2),
+        entryOf(here.indices, one2, fn ?? "default")
+      ]);
       if (own === "auto") {
-        if (!above)
-          push(
-            labelCells(path2, repeated, `${caption} Total`),
-            numbers3(child3),
-            { indices: at, type: "default" },
-            level
-          );
+        if (showsValue) return;
+        if (valuesAbove) subtotal(fillCaption(caps.subtotal, caption), void 0, measure);
+        else measures.forEach((one2, m) => subtotal(`${caption} ${one2.caption}`, void 0, m));
       } else
         for (const fn of own)
-          push(
-            labelCells(path2, repeated, `${caption} ${PIVOT_SUBTOTALS[fn].label}`),
-            subtotalNumbers(child3, fn),
-            { indices: at, type: fn },
-            level
-          );
+          if (valuesAbove) subtotal(`${caption} ${caps.functions[fn]}`, fn, measure);
+          else
+            measures.forEach(
+              (one2, m) => subtotal(`${caption} ${caps.functions[fn]} of ${one2.field}`, fn, m)
+            );
     });
   };
-  emit(root, 0, [], [], []);
-  push(
-    compact ? ["Grand Total"] : ["Grand Total", ...Array(depth - 1).fill(null)],
-    numbers3(root),
-    { indices: [0], type: "grand" },
-    0
-  );
+  const grand = (text2, measure) => push(0, () => [
+    compact ? [text2] : [text2, ...Array(levels - 1).fill(null)],
+    cells2(root, void 0, measure),
+    entryOf([0], measure, "grand")
+  ]);
+  const build = () => {
+    walk(0, root, void 0, { labels: [], indices: [], firsts: [] });
+    if (onRows) measures.forEach((one2, m) => grand(fillCaption(caps.measureTotal, one2.caption), m));
+    else grand(caps.grandTotal);
+  };
+  build();
+  counting = false;
+  values2 = pivotColumnHeaders(pivot, columns, compact ? [caps.rowLabels] : rowTitles, onRows);
+  const firstDataRow = values2.length;
+  indents = values2.map(() => 0);
+  build();
   return {
     values: values2,
     rowItems: axisItems[0],
@@ -17759,17 +17608,20 @@ function nestedPivotGrid(pivot) {
     rowEntries,
     firstDataRow,
     rowLabelColumns: labelColumns,
-    indents
+    indents,
+    ...onRows ? { firstHeaderRow: 1 } : {}
   };
 }
-var label4, MAX_CELLS, node;
+var MAX_CELLS, node;
 var init_nested = __esm({
   "xlsx/pivot/nested.ts"() {
     init_data();
+    init_item_labels();
+    init_axes();
     init_columns();
     init_measures();
+    init_captions();
     init_subtotals();
-    label4 = pivotItemLabel;
     MAX_CELLS = 1e6;
     node = (index2, value) => ({
       index: index2,
@@ -17784,98 +17636,7 @@ var init_nested = __esm({
 // xlsx/pivot/aggregate.ts
 function pivotGrid(pivot) {
   validatePivotFields(pivot);
-  return prependPivotPage(pivotDataGrid(pivotPageProjection(pivot)), pivot);
-}
-function pivotDataGrid(pivot) {
-  if (pivot.valuesAxis !== "rows") return nestedPivotGrid(pivot);
-  if (pivot.secondRowField) return hierarchicalPivotGrid(pivot);
-  const rowItems = pivotItems(pivot, pivot.rowField);
-  const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  const compact = pivot.layout === "compact";
-  const headings = pivot.layout !== void 0 && pivot.layout !== "tabular";
-  const dimensions = pivotHeaderDimensions(pivot, columnItems.length, compact ? 1 : 2);
-  const dataRows = (rowItems.length + 1) * (1 + (pivot.additionalValues?.length ?? 0)) + (headings ? rowItems.length : 0);
-  if ((dataRows + dimensions.rows) * dimensions.width > 1e6)
-    throw new Error("The PivotTable result is too large.");
-  const label5 = pivotItemLabel;
-  const values2 = pivotHeaders(pivot, columnItems, [compact ? "Row Labels" : pivot.rowField], label5);
-  const rowField = pivot.fields.indexOf(pivot.rowField);
-  const colField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const groups = /* @__PURE__ */ new Map();
-  const cells2 = /* @__PURE__ */ new Map();
-  const columns = /* @__PURE__ */ new Map();
-  const collect = (map, key, record) => {
-    const found = map.get(key);
-    if (found) found.push(record);
-    else map.set(key, [record]);
-  };
-  for (const record of pivot.records) {
-    const key = pivotValueKey(record[rowField] ?? null);
-    collect(groups, key, record);
-    if (pivot.columnField) {
-      const col = pivotValueKey(record[colField] ?? null);
-      collect(columns, col, record);
-      collect(cells2, JSON.stringify([key, col]), record);
-    }
-  }
-  const firstDataRow = values2.length;
-  const measures = pivotMeasures(pivot);
-  const rowEntries = [];
-  const indents = values2.map(() => 0);
-  const append = (caption, bands, index2, grand = false) => {
-    measures.forEach((measure, m) => {
-      values2.push([
-        ...compact ? [grand ? `Total ${measure.caption}` : measure.caption] : [
-          grand ? `Total ${measure.caption}` : pivot.repeatLabels || !headings && m === 0 ? caption : null,
-          grand ? null : measure.caption
-        ],
-        ...bands.map((band) => band[m] ?? null)
-      ]);
-      indents.push(compact && !grand ? 1 : 0);
-      rowEntries.push({
-        indices: grand ? [0] : [index2, m],
-        measure: m,
-        ...grand ? { type: "grand" } : {}
-      });
-    });
-  };
-  rowItems.forEach((item, index2) => {
-    const key = pivotValueKey(item);
-    if (headings) {
-      values2.push([label5(item), ...Array(dimensions.width - 1).fill(null)]);
-      rowEntries.push({ indices: [index2] });
-      indents.push(0);
-    }
-    append(
-      label5(item),
-      [
-        ...columnItems.map(
-          (col) => pivotNumbers(pivot, cells2.get(JSON.stringify([key, pivotValueKey(col)])) ?? [])
-        ),
-        pivotNumbers(pivot, groups.get(key) ?? [])
-      ],
-      index2
-    );
-  });
-  append(
-    "Grand Total",
-    [
-      ...columnItems.map((col) => pivotNumbers(pivot, columns.get(pivotValueKey(col)) ?? [])),
-      pivotNumbers(pivot, pivot.records)
-    ],
-    0,
-    true
-  );
-  return {
-    values: values2,
-    rowItems,
-    columnItems,
-    firstDataRow,
-    rowLabelColumns: compact ? 1 : 2,
-    indents,
-    firstHeaderRow: 1,
-    rowEntries
-  };
+  return prependPivotPage(nestedPivotGrid(pivotPageProjection(pivot)), pivot);
 }
 function pivotTableAt(sheet, at) {
   return sheet.pivotTables?.find((pivot) => rangeContains(pivot.location, at));
@@ -17885,9 +17646,7 @@ var init_aggregate = __esm({
     init_address();
     init_data();
     init_page_filter();
-    init_hierarchy();
     init_nested();
-    init_measures();
   }
 });
 
@@ -18042,7 +17801,7 @@ function groupby(args, ctx) {
   if (rows.length === 0) fail(ERR.CALC);
   const groups = /* @__PURE__ */ new Map();
   for (const r of rows) {
-    const key = keyOf(keysM.data[r]);
+    const key = keyOf2(keysM.data[r]);
     const found = groups.get(key);
     if (found) found.push(r);
     else groups.set(key, [r]);
@@ -18109,8 +17868,8 @@ function pivotby(args, ctx) {
   const colKeys = /* @__PURE__ */ new Map();
   for (const r of used) {
     for (const [map, key] of [
-      [rowKeys, keyOf(rowsM.data[r])],
-      [colKeys, keyOf(colsM.data[r])]
+      [rowKeys, keyOf2(rowsM.data[r])],
+      [colKeys, keyOf2(colsM.data[r])]
     ]) {
       const found = map.get(key);
       if (found) found.push(r);
@@ -18170,7 +17929,7 @@ function pivotby(args, ctx) {
   ];
   return new Matrix([header, ...lines]);
 }
-var column, optional, keyOf, plain2, lazy, GROUPBY_FUNCTIONS;
+var column, optional, keyOf2, plain2, lazy, GROUPBY_FUNCTIONS;
 var init_groupby = __esm({
   "xlsx/formula/functions/groupby.ts"() {
     init_coerce();
@@ -18181,7 +17940,7 @@ var init_groupby = __esm({
       const arg = args[i];
       return arg && arg.node.type !== "missing" ? arg.get() : void 0;
     };
-    keyOf = (values2) => JSON.stringify(values2);
+    keyOf2 = (values2) => JSON.stringify(values2);
     plain2 = (v) => v === void 0 || isError(v) ? null : v;
     lazy = (name2, syntax, description, minArgs, maxArgs, fn) => ({
       name: name2,
@@ -20958,7 +20717,7 @@ var init_layout = __esm({
 });
 
 // diagram/hierarchy/index.ts
-var init_hierarchy2 = __esm({
+var init_hierarchy = __esm({
   "diagram/hierarchy/index.ts"() {
   }
 });
@@ -21336,9 +21095,9 @@ var init_gradient_preset_data = __esm({
 var init_gradient_presets = __esm({
   "drawingml/gradient-presets.ts"() {
     init_gradient_preset_data();
-    OFFICE_GRADIENT_PRESET_DATA.map(([label5], index2) => ({
+    OFFICE_GRADIENT_PRESET_DATA.map(([label2], index2) => ({
       id: index2 + 1,
-      label: label5
+      label: label2
     }));
   }
 });
@@ -21361,7 +21120,7 @@ var init_diagram = __esm({
     init_types3();
     init_engine();
     init_layout();
-    init_hierarchy2();
+    init_hierarchy();
     init_attributes();
     init_layout_category();
     init_relationships2();
@@ -21595,8 +21354,8 @@ function parseTable(xml, partName) {
       if (id !== void 0 && Number.isInteger(id) && id >= 0) column2.sourceId = id;
       const fn = att(node2, "totalsRowFunction");
       if (fn && fn !== "none") column2.totalsRowFunction = fn;
-      const label5 = att(node2, "totalsRowLabel");
-      if (label5 !== void 0) column2.totalsRowLabel = label5;
+      const label2 = att(node2, "totalsRowLabel");
+      if (label2 !== void 0) column2.totalsRowLabel = label2;
       const calculated = xFirst(node2, "calculatedColumnFormula");
       if (calculated) column2.calculatedColumnFormula = stripFuturePrefixes(xText(calculated));
       return column2;
@@ -22984,15 +22743,15 @@ function derivedFields(pivot, date1904) {
 function derivedFieldXml(pivot, entry3, date1904) {
   const range = { start: entry3.group.start, end: entry3.group.end };
   const days = dateGroupDays(entry3.group);
-  const labels = dateUnitLabels(entry3.unit, range, days, date1904);
+  const labels = dateUnitLabels(entry3.unit, range, days, date1904, entry3.group);
   const base = pivot.fields.indexOf(entry3.group.field);
-  return `<cacheField${attrs({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base}"><rangePr${attrs({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range.start, date1904), endDate: serialToIso(range.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label5) => `<s v="${escapeAttr3(label5)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
+  return `<cacheField${attrs({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base}"><rangePr${attrs({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range.start, date1904), endDate: serialToIso(range.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label2) => `<s v="${escapeAttr3(label2)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
 }
 function groupXml2(pivot, name2, index2) {
   const group = groupOf(pivot, name2);
   if (!group) return "";
   const labels = numberGroupLabels(group);
-  return `<fieldGroup base="${index2}"><rangePr autoStart="0" autoEnd="0" startNum="${group.start}" endNum="${group.end}" groupInterval="${group.by}"/><groupItems count="${labels.length}">${labels.map((label5) => `<s v="${escapeAttr3(label5)}"/>`).join("")}</groupItems></fieldGroup>`;
+  return `<fieldGroup base="${index2}"><rangePr autoStart="0" autoEnd="0" startNum="${group.start}" endNum="${group.end}" groupInterval="${group.by}"/><groupItems count="${labels.length}">${labels.map((label2) => `<s v="${escapeAttr3(label2)}"/>`).join("")}</groupItems></fieldGroup>`;
 }
 function slicerExt(pivot) {
   if (pivot.slicerCacheId === void 0) return "";
@@ -23025,6 +22784,7 @@ function remapPivotRowEntries(entries, axes2) {
     (entry3) => entry3.type === "grand" ? entry3 : {
       ...entry3,
       indices: entry3.indices.map((item, axis) => {
+        if (axes2[axis] === null) return item;
         const index2 = axes2[axis]?.[item];
         if (index2 === void 0) throw new Error("Invalid report row axis item");
         return index2;
@@ -23052,8 +22812,6 @@ function pivotTableXml(source2, cacheId, cache3) {
   const pivot = expandDateGroups(source2);
   const rowNames = pivotRowFields(pivot);
   const rowIdx = rowNames.map((name2) => pivot.fields.indexOf(name2));
-  const row2 = rowIdx[0];
-  const second = rowIdx[1] ?? -1;
   const page = pivot.pageFilter ? pivot.fields.indexOf(pivot.pageFilter.field) : -1;
   const pageItems = page >= 0 ? pivotItems(pivot, pivot.pageFilter.field) : [];
   const filtered2 = filteredFields(pivot);
@@ -23081,7 +22839,10 @@ function pivotTableXml(source2, cacheId, cache3) {
   const columnIndicesFull = columnNames.map(
     (_name, k) => itemIndices(visibleColumns[k], columnItemsFull[k])
   );
-  const rowEntries = anyFull && grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, rowIndicesFull) : grid.rowEntries;
+  const valuesAt = pivotValuesIndex(pivot);
+  const levelAxes = [...rowIndicesFull];
+  if (valuesAt >= 0) levelAxes.splice(valuesAt, 0, null);
+  const rowEntries = anyFull && grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, levelAxes) : grid.rowEntries;
   const pageOffset = page >= 0 ? 2 : 0;
   const col = columnIdx[0] ?? -1;
   const measures = pivotMeasures(pivot);
@@ -23090,13 +22851,17 @@ function pivotTableXml(source2, cacheId, cache3) {
   const compact = pivot.layout === "compact";
   const outline = pivot.layout === "compact" || pivot.layout === "outline";
   const top = (pivot.subtotalPosition ?? (outline ? "top" : "bottom")) === "top";
+  const named2 = (field, item) => {
+    const text2 = pivotItemName(pivot, field, item);
+    return text2 === void 0 ? "" : attrs({ n: encodeEscapes(text2) });
+  };
   const fields = pivot.fields.map((name2, index2) => {
     const isDate = pivot.dateFields?.includes(name2) ?? false;
     const at = rowIdx.indexOf(index2);
     const colAt = columnIdx.indexOf(index2);
     const items2 = index2 === page ? pageItems : at >= 0 ? rowItemsFull[at] : colAt >= 0 ? columnItemsFull[colAt] : groupLabelsOf(pivot, name2) ?? (filtered2.has(name2) || isDate ? pivotItems(pivot, name2) : void 0);
     const hidden = hiddenItemKeys(pivot, name2);
-    const functions = at >= 0 ? fieldSubtotalFunctions(pivot, name2) : "auto";
+    const functions = at >= 0 || colAt >= 0 ? fieldSubtotalFunctions(pivot, name2) : "auto";
     const automatic = functions === "auto";
     const custom = automatic ? [] : functions;
     const repeated = pivot.repeatLabels && at >= 0 ? `<extLst><ext uri="{2946ED86-A175-432a-8AC1-64E0C546D7DE}"><x14:pivotField xmlns:x14="${X14}" fillDownLabels="1"/></ext></extLst>` : "";
@@ -23104,37 +22869,27 @@ function pivotTableXml(source2, cacheId, cache3) {
       custom.map((fn) => [PIVOT_SUBTOTALS[fn].attr, true])
     );
     const entries = automatic ? '<item t="default"/>' : custom.map((fn) => `<item t="${PIVOT_SUBTOTALS[fn].item}"/>`).join("");
-    return `<pivotField${attrs({ axis: index2 === page ? "axisPage" : at >= 0 ? "axisRow" : colAt >= 0 ? "axisCol" : void 0, dataField: measures.some((measure) => pivot.fields.indexOf(measure.field) === index2) ? true : void 0, compact, outline, showAll: false, subtotalTop: at >= 0 ? top : void 0, numFmtId: isDate ? 14 : void 0, defaultSubtotal: automatic ? void 0 : false, ...flags })}>${items2 ? `<items count="${items2.length + (automatic ? 1 : custom.length)}">${items2.map((item) => `<item${hidden.has(pivotValueKey(item)) ? ' h="1"' : ""} x="${itemX(index2, item)}"/>`).join("")}${entries}</items>` : ""}${repeated}</pivotField>`;
+    return `<pivotField${attrs({ axis: index2 === page ? "axisPage" : at >= 0 ? "axisRow" : colAt >= 0 ? "axisCol" : void 0, dataField: measures.some((measure) => pivot.fields.indexOf(measure.field) === index2) ? true : void 0, compact, outline, showAll: false, subtotalTop: at >= 0 ? top : void 0, numFmtId: isDate ? 14 : void 0, defaultSubtotal: automatic ? void 0 : false, ...flags })}>${items2 ? `<items count="${items2.length + (automatic ? 1 : custom.length)}">${items2.map((item) => `<item${hidden.has(pivotValueKey(item)) ? ' h="1"' : ""}${named2(name2, item)} x="${itemX(index2, item)}"/>`).join("")}${entries}</items>` : ""}${repeated}</pivotField>`;
   }).join("");
   const items = (count2, indices) => Array.from({ length: count2 }, (_v, i) => `<i><x v="${indices?.[i] ?? i}"/></i>`).join("") + '<i t="grand"><x/></i>';
   const header = grid.firstHeaderRow !== void 0 ? grid.firstHeaderRow - pageOffset : col >= 0 ? 1 : grid.firstDataRow - pageOffset - 1;
-  const rowIndices = rowsAxis && pivot.valuesPosition === "first" ? [-2, row2, second] : rowsAxis && pivot.valuesPosition === "between" ? [row2, -2, second] : [...rowIdx, ...rowsAxis ? [-2] : []];
+  const rowIndices = [...rowIdx];
+  if (valuesAt >= 0) rowIndices.splice(valuesAt, 0, -2);
   let previous = [];
   const rowItems = rowEntries?.map((entry3) => {
     let prefix = 0;
     const type = entry3.type === void 0 || entry3.type === "default" || entry3.type === "grand" ? entry3.type : PIVOT_SUBTOTALS[entry3.type].item;
-    if (rowsAxis) {
-      if (entry3.type === "default" && pivot.valuesPosition === "first") prefix = 1;
-      else if (!entry3.type)
-        while (prefix < entry3.indices.length - 1 && entry3.indices[prefix] === previous[prefix])
-          prefix++;
-      previous = entry3.type && !(entry3.type === "default" && pivot.valuesPosition === "first") ? [] : entry3.indices;
-    } else {
-      if (entry3.type !== "grand") prefix = sharedPrefix(entry3.indices, previous);
-      previous = entry3.type === "grand" ? [] : entry3.indices;
-    }
+    if (entry3.type !== "grand") prefix = sharedPrefix(entry3.indices, previous);
+    previous = entry3.type === "grand" ? [] : entry3.indices;
     return `<i${attrs({ t: type, r: prefix || void 0, i: entry3.measure || void 0 })}>${entry3.indices.slice(prefix).map((index2) => `<x${attrs({ v: index2 || void 0 })}/>`).join("")}</i>`;
   }).join("") ?? items(grid.rowItems.length, rowIndicesFull[0]);
   let body = `<location${attrs({ ref: formatRange({ ...pivot.location, start: { ...pivot.location.start, row: pivot.location.start.row + pageOffset } }), firstHeaderRow: header, firstDataRow: grid.firstDataRow - pageOffset, rowPageCount: page >= 0 ? 1 : void 0, colPageCount: page >= 0 ? 1 : void 0, firstDataCol: grid.rowLabelColumns ?? 1 })}/><pivotFields count="${pivot.fields.length}">${fields}</pivotFields><rowFields count="${rowIndices.length}">${rowIndices.map((index2) => `<field x="${index2}"/>`).join("")}</rowFields><rowItems count="${grid.rowEntries?.length ?? grid.rowItems.length + 1}">${rowItems}</rowItems>`;
-  if (!rowsAxis && col >= 0 && grid.columnEntries) {
-    const fieldsOnColumns = [...columnIdx, ...multiple ? [-2] : []];
-    body += `<colFields count="${fieldsOnColumns.length}">${fieldsOnColumns.map((index2) => `<field x="${index2}"/>`).join("")}</colFields>${pivotColumnItemsXml(grid.columnEntries, measures.length, (level, index2) => columnIndicesFull[level][index2])}`;
+  if (col >= 0 && grid.columnEntries) {
+    const fieldsOnColumns = [...columnIdx, ...multiple && !rowsAxis ? [-2] : []];
+    body += `<colFields count="${fieldsOnColumns.length}">${fieldsOnColumns.map((index2) => `<field x="${index2}"/>`).join("")}</colFields>${pivotColumnItemsXml(grid.columnEntries, rowsAxis ? 1 : measures.length, (level, index2) => columnIndicesFull[level][index2])}`;
   } else if (multiple && !rowsAxis)
     body += `<colFields count="1"><field x="-2"/></colFields>${pivotValueAxisItems(measures.length)}`;
-  else if (col >= 0)
-    body += `<colFields count="1"><field x="${col}"/></colFields><colItems count="${grid.columnItems.length + 1}">${items(grid.columnItems.length, columnIndicesFull[0])}</colItems>`;
-  else
-    body += rowsAxis ? '<colItems count="1"><i/></colItems>' : page >= 0 ? '<colItems count="1"><i/></colItems>' : '<colItems count="1"><i><x/></i></colItems>';
+  else body += '<colItems count="1"><i/></colItems>';
   if (page >= 0)
     body += `<pageFields count="1"><pageField${attrs({ fld: page, hier: -1, item: pivot.pageFilter.item !== void 0 ? pageItems.findIndex((item) => pivotValueKey(item) === pivotValueKey(pivot.pageFilter.item)) : void 0 })}/></pageFields>`;
   body += `<dataFields count="${measures.length}">${measures.map((measure) => `<dataField${attrs({ name: encodeEscapes(measure.caption), fld: pivot.fields.indexOf(measure.field), subtotal: measure.aggregate, baseField: 0, baseItem: 0 })}/>`).join("")}</dataFields>`;
@@ -23144,9 +22899,17 @@ function pivotTableXml(source2, cacheId, cache3) {
   const root = doc.documentElement;
   root.setAttribute("name", pivot.name);
   root.setAttribute("cacheId", String(cacheId));
+  const caps = pivotCaptions(pivot);
+  root.setAttribute("dataCaption", caps.values);
+  for (const [attribute2, key] of [
+    ["rowHeaderCaption", "rowLabels"],
+    ["colHeaderCaption", "columnLabels"],
+    ["grandTotalCaption", "grandTotal"]
+  ])
+    if (caps[key] !== ENGLISH_PIVOT_CAPTIONS[key] || root.hasAttribute(attribute2))
+      root.setAttribute(attribute2, caps[key]);
   root.setAttribute("dataOnRows", rowsAxis ? "1" : "0");
-  if (rowsAxis && (pivot.valuesPosition === "between" || pivot.valuesPosition === "first"))
-    root.setAttribute("dataPosition", pivot.valuesPosition === "first" ? "0" : "1");
+  if (rowsAxis && valuesAt < rowIdx.length) root.setAttribute("dataPosition", String(valuesAt));
   else root.removeAttribute("dataPosition");
   root.setAttribute("compact", compact ? "1" : "0");
   root.setAttribute("compactData", compact ? "1" : "0");
@@ -23212,13 +22975,15 @@ function pivotTableXml(source2, cacheId, cache3) {
 }
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  return `<filters count="1"><filter${attrs({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id: 1, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
+  const id = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  return `<filters count="1"><filter${attrs({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
 }
 var X14;
 var init_table_xml = __esm({
   "xlsx/pivot/table-xml.ts"() {
     init_xml2();
     init_data();
+    init_axes();
     init_columns();
     init_date_groups();
     init_groups();
@@ -23226,6 +22991,8 @@ var init_table_xml = __esm({
     init_address();
     init_xml_out();
     init_aggregate();
+    init_captions();
+    init_item_labels();
     init_measures();
     init_subtotals();
     init_values_axis();
@@ -24072,8 +23839,8 @@ function sanitizeMentionTarget(raw2) {
 }
 function resolveMentions(text2, candidates) {
   const targets = [];
-  for (const candidate of candidates) {
-    const clean = sanitizeMentionTarget(candidate);
+  for (const candidate2 of candidates) {
+    const clean = sanitizeMentionTarget(candidate2);
     if (clean) targets.push(clean);
   }
   if (targets.length === 0) return [];
@@ -24434,8 +24201,8 @@ function createPeer(selfId, peerId, factory, createStream, config, tracks, callb
       callbacks.onStream(stream);
     }
   };
-  pc.onicecandidate = ({ candidate }) => {
-    if (candidate) callbacks.sendCandidate(candidate);
+  pc.onicecandidate = ({ candidate: candidate2 }) => {
+    if (candidate2) callbacks.sendCandidate(candidate2);
   };
   pc.onconnectionstatechange = () => {
     callbacks.onConnection(pc.connectionState);
@@ -24477,9 +24244,9 @@ function createPeer(selfId, peerId, factory, createStream, config, tracks, callb
         fail2(error);
       }
     },
-    async receiveCandidate(candidate) {
+    async receiveCandidate(candidate2) {
       try {
-        await pc.addIceCandidate(candidate);
+        await pc.addIceCandidate(candidate2);
       } catch (error) {
         if (!ignoreOffer) fail2(error);
       }
@@ -24592,7 +24359,7 @@ function createCallSession(options) {
         { audio: local.audio, video: videoTrack() },
         {
           sendDescription: (description) => send({ type: "description", from: self.id, to: id, description }),
-          sendCandidate: (candidate) => send({ type: "candidate", from: self.id, to: id, candidate }),
+          sendCandidate: (candidate2) => send({ type: "candidate", from: self.id, to: id, candidate: candidate2 }),
           onStream: (stream) => {
             remote.stream = stream;
             publish();
@@ -25117,11 +24884,86 @@ function minuteOfDay(ms, zone) {
   return p.hour * 60 + p.minute;
 }
 
+// teams/recurrence-calendar.ts
+var WEEKDAY_ORDINALS = [1, 2, 3, 4, -1];
+var MAX_MONTH_STEPS = 24e3;
+var MAX_YEAR_STEPS = 6e3;
+var isCalendarRepeat = (repeat) => repeat === "monthly" || repeat === "yearly";
+var daysInMonth = (year, month) => new Date(Date.UTC(year, month, 0)).getUTCDate();
+var ordinalOfDay = (day) => day > 28 ? -1 : Math.ceil(day / 7);
+function dayMatchesOrdinal(year, month, day, ordinal) {
+  return ordinal === -1 ? day + 7 > daysInMonth(year, month) : Math.ceil(day / 7) === ordinal && ordinal >= 1 && ordinal <= 4;
+}
+function nthWeekdayOfMonth(year, month, weekday2, ordinal) {
+  const first2 = new Date(Date.UTC(year, month - 1, 1)).getUTCDay();
+  if (ordinal === -1) {
+    const length = daysInMonth(year, month);
+    const lastWeekday = (first2 + length - 1) % 7;
+    return length - (lastWeekday - weekday2 + 7) % 7;
+  }
+  return 1 + (weekday2 - first2 + 7) % 7 + (ordinal - 1) * 7;
+}
+function anchorOf(meeting) {
+  const p = zonedParts(meeting.start, meeting.zone);
+  const weekday2 = new Date(Date.UTC(p.year, p.month - 1, p.day)).getUTCDay();
+  const ordinal = meeting.ordinal !== void 0 && WEEKDAY_ORDINALS.includes(meeting.ordinal) ? meeting.ordinal : ordinalOfDay(p.day);
+  return { ...p, weekday: weekday2, ordinal, byWeekday: meeting.monthlyBy === "weekday" };
+}
+function candidate(a2, yearly, j) {
+  if (j === 0) return { year: a2.year, month: a2.month, day: a2.day };
+  if (yearly) {
+    const year2 = a2.year + j;
+    return a2.day <= daysInMonth(year2, a2.month) ? { year: year2, month: a2.month, day: a2.day } : null;
+  }
+  const total2 = a2.year * 12 + (a2.month - 1) + j;
+  const year = Math.floor(total2 / 12);
+  const month = total2 % 12 + 1;
+  if (a2.byWeekday)
+    return { year, month, day: nthWeekdayOfMonth(year, month, a2.weekday, a2.ordinal) };
+  return a2.day <= daysInMonth(year, month) ? { year, month, day: a2.day } : null;
+}
+function* calendarSlots(meeting) {
+  const a2 = anchorOf(meeting);
+  const yearly = meeting.repeat === "yearly";
+  let index2 = 0;
+  for (let j = 0; j < (yearly ? MAX_YEAR_STEPS : MAX_MONTH_STEPS); j++) {
+    const d = candidate(a2, yearly, j);
+    if (d) yield { index: index2++, ...d };
+  }
+}
+function slotStart(meeting, slot) {
+  const p = zonedParts(meeting.start, meeting.zone);
+  return zonedToUtc({ ...slot, hour: p.hour, minute: p.minute, second: p.second }, meeting.zone);
+}
+function slotAt(meeting, index2) {
+  for (const slot of calendarSlots(meeting)) if (slot.index === index2) return slot;
+  return null;
+}
+function slotStarting(meeting, start) {
+  const p = zonedParts(start, meeting.zone);
+  for (const slot of calendarSlots(meeting)) {
+    if (slot.year > p.year || slot.year === p.year && slot.month > p.month) return null;
+    if (slot.year === p.year && slot.month === p.month && slot.day === p.day)
+      return slotStart(meeting, slot) === start ? slot : null;
+  }
+  return null;
+}
+function repeatChoices(start, zone) {
+  const p = zonedParts(start, zone);
+  const weekday2 = new Date(Date.UTC(p.year, p.month - 1, p.day)).getUTCDay();
+  const ordinals = WEEKDAY_ORDINALS.filter((o) => dayMatchesOrdinal(p.year, p.month, p.day, o));
+  return { month: p.month, day: p.day, weekday: weekday2, ordinals };
+}
+
 // teams/recurrence.ts
 var MAX_RECURRENCE_COUNT = 999;
 var stepDays = (meeting) => meeting.repeat === "daily" ? 1 : 7;
 function seriesStart(meeting, index2) {
   if (index2 === 0 || meeting.repeat === "none") return meeting.start;
+  if (isCalendarRepeat(meeting.repeat)) {
+    const slot = slotAt(meeting, index2);
+    return slot ? slotStart(meeting, slot) : Number.POSITIVE_INFINITY;
+  }
   const anchor = zonedParts(meeting.start, meeting.zone);
   return zonedToUtc({ ...anchor, day: anchor.day + index2 * stepDays(meeting) }, meeting.zone);
 }
@@ -25136,6 +24978,7 @@ function seriesBetween(meeting, from, to, limit2 = 400) {
   if (to <= from) return [];
   if (meeting.repeat === "none")
     return meeting.start < to && meeting.end > from ? [{ index: 0, start: meeting.start }] : [];
+  if (isCalendarRepeat(meeting.repeat)) return calendarBetween(meeting, from, to, limit2);
   const step = stepDays(meeting) * DAY_MS;
   const first2 = Math.max(0, Math.floor((from - meeting.end) / step) - 1);
   const last = Math.ceil((to - meeting.start) / step) + 1;
@@ -25151,8 +24994,28 @@ function seriesBetween(meeting, from, to, limit2 = 400) {
   }
   return out;
 }
+function calendarBetween(meeting, from, to, limit2) {
+  const span2 = meeting.end - meeting.start;
+  const time2 = zonedParts(meeting.start, meeting.zone);
+  const out = [];
+  for (const slot of calendarSlots(meeting)) {
+    if (meeting.count !== void 0 && slot.index >= meeting.count) break;
+    const wall = Date.UTC(slot.year, slot.month - 1, slot.day, time2.hour, time2.minute);
+    if (wall - DAY_MS >= to || out.length >= limit2) break;
+    if (wall + span2 + DAY_MS <= from) continue;
+    const start = slot.index === 0 ? meeting.start : slotStart(meeting, slot);
+    if (meeting.until !== void 0 && start > meeting.until) break;
+    if (start < to && start + span2 > from) out.push({ index: slot.index, start });
+  }
+  return out;
+}
 function seriesIndexOf(meeting, start) {
   if (meeting.repeat === "none") return start === meeting.start ? 0 : null;
+  if (isCalendarRepeat(meeting.repeat)) {
+    if (start === meeting.start) return 0;
+    const slot = slotStarting(meeting, start);
+    return slot && withinSeries(meeting, slot.index, start) ? slot.index : null;
+  }
   const guess = Math.round((start - meeting.start) / (stepDays(meeting) * DAY_MS));
   for (const k of [guess, guess - 1, guess + 1])
     if (k >= 0 && seriesStart(meeting, k) === start && withinSeries(meeting, k, start)) return k;
@@ -26446,14 +26309,23 @@ function alarm(title) {
     "END:VALARM"
   ];
 }
+var BYDAY = ["SU", "MO", "TU", "WE", "TH", "FR", "SA"];
+function calendarParts(meeting) {
+  if (meeting.repeat !== "monthly" && meeting.repeat !== "yearly") return "";
+  const p = zonedParts(meeting.start, meeting.zone);
+  if (meeting.repeat === "yearly") return `;BYMONTH=${p.month};BYMONTHDAY=${p.day}`;
+  if (meeting.monthlyBy !== "weekday") return `;BYMONTHDAY=${p.day}`;
+  const weekday2 = new Date(Date.UTC(p.year, p.month - 1, p.day)).getUTCDay();
+  return `;BYDAY=${meeting.ordinal ?? ordinalOfDay(p.day)}${BYDAY[weekday2]}`;
+}
 function recurrenceRule(meeting) {
   if (meeting.repeat === "none") return [];
-  const freq = meeting.repeat === "daily" ? "DAILY" : "WEEKLY";
+  const freq = meeting.repeat.toUpperCase();
   const end = meeting.count !== void 0 ? `;COUNT=${meeting.count}` : meeting.until !== void 0 ? `;UNTIL=${icsUtc(meeting.until)}` : "";
   const utc = UTC_ZONES.has(meeting.zone);
   const exdates = (meeting.exceptions ?? []).filter((e) => e.cancelled).map((e) => utc ? icsUtc(e.originalStart) : icsLocal(e.originalStart, meeting.zone));
   return [
-    `RRULE:FREQ=${freq}${end}`,
+    `RRULE:FREQ=${freq}${calendarParts(meeting)}${end}`,
     ...exdates.length ? [utc ? `EXDATE:${exdates.join(",")}` : `EXDATE;TZID=${meeting.zone}:${exdates.join(",")}`] : []
   ];
 }
@@ -26568,13 +26440,32 @@ function exceptionValue(patch, previous) {
 }
 
 // teams/meetings.ts
-var MEETING_REPEATS = ["none", "daily", "weekly"];
+var MEETING_REPEATS = [
+  "none",
+  "daily",
+  "weekly",
+  "monthly",
+  "yearly"
+];
 var MAX_MEETING_TITLE = 120;
 var MAX_MEETING_DESCRIPTION = 2e3;
 var MAX_MEETING_HOURS = 24;
 var MEETINGS = "teams:meetings";
 var SAFE_ID = /^[\w-]{1,64}$/u;
 var finiteTime = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 && v < 864e13 ? Math.floor(v) : null;
+function readPattern(kind, by, ordinal, start, zone) {
+  if (kind !== "monthly" || by !== "weekday") return {};
+  const p = zonedParts(start, zone);
+  const fits = typeof ordinal === "number" && WEEKDAY_ORDINALS.includes(ordinal) && dayMatchesOrdinal(p.year, p.month, p.day, ordinal);
+  return { monthlyBy: "weekday", ordinal: fits ? ordinal : ordinalOfDay(p.day) };
+}
+function withOrdinal(input, repeat, by, current, start, zone) {
+  if (repeat !== "monthly" || by !== "weekday") return input;
+  const p = zonedParts(start, zone);
+  const fits = (o) => o !== void 0 && WEEKDAY_ORDINALS.includes(o) && dayMatchesOrdinal(p.year, p.month, p.day, o);
+  if (input.ordinal !== void 0) return fits(input.ordinal) ? input : null;
+  return { ...input, ordinal: fits(current) ? current : ordinalOfDay(p.day) };
+}
 function readMeeting(id, raw2) {
   if (!(raw2 instanceof Y.Map) || !SAFE_ID.test(id)) return null;
   const start = finiteTime(raw2.get("start"));
@@ -26593,16 +26484,19 @@ function readMeeting(id, raw2) {
   const until = finiteTime(raw2.get("until"));
   const total2 = typeof count2 === "number" && Number.isInteger(count2) && count2 >= 1 ? Math.min(count2, MAX_RECURRENCE_COUNT) : null;
   const exceptions = kind === "none" ? [] : readExceptions(raw2.get("exceptions"));
+  const zoneId = isValidZone(zone) ? zone : "UTC";
+  const pattern = readPattern(kind, raw2.get("monthlyBy"), raw2.get("ordinal"), start, zoneId);
   return {
     id,
     title,
     description: sanitizeMessageText(raw2.get("description")).slice(0, MAX_MEETING_DESCRIPTION),
     organizerId,
     organizerName: sanitizeChannelName(raw2.get("organizerName")) || "Unknown",
-    zone: isValidZone(zone) ? zone : "UTC",
+    zone: zoneId,
     start,
     end,
     repeat: kind,
+    ...pattern,
     ...kind === "none" ? {} : total2 !== null ? { count: total2 } : until !== null ? { until } : {},
     ...exceptions.length ? { exceptions } : {},
     attendees: sanitizeMembers(raw2.get("attendees")),
@@ -26625,6 +26519,12 @@ function createMeetingStore(doc, user, now = Date.now) {
     if (input.end !== void 0) row2.set("end", input.end);
     if (input.repeat !== void 0 && MEETING_REPEATS.includes(input.repeat))
       row2.set("repeat", input.repeat);
+    if (input.monthlyBy !== void 0) {
+      if (input.monthlyBy === "weekday" || input.monthlyBy === "date")
+        row2.set("monthlyBy", input.monthlyBy);
+    }
+    if (input.ordinal !== void 0 && WEEKDAY_ORDINALS.includes(input.ordinal))
+      row2.set("ordinal", input.ordinal);
     if (input.count !== void 0) {
       if (input.count === null) row2.delete("count");
       else {
@@ -26668,6 +26568,10 @@ function createMeetingStore(doc, user, now = Date.now) {
       const end = finiteTime(input.end);
       if (!sanitizeChannelName(input.title) || start === null || end === null) return null;
       if (end <= start || end - start > MAX_MEETING_HOURS * 36e5) return null;
+      const zone = isValidZone(input.zone) ? input.zone : localZone();
+      const repeat = input.repeat ?? "none";
+      const checked = withOrdinal(input, repeat, input.monthlyBy, void 0, start, zone);
+      if (!checked) return null;
       const id = nextId("t").replace(/[^\w-]/gu, "");
       doc.transact(() => {
         const row2 = new Y.Map();
@@ -26675,9 +26579,9 @@ function createMeetingStore(doc, user, now = Date.now) {
         row2.set("organizerName", user.name);
         row2.set("createdAt", now());
         row2.set("cancelled", false);
-        row2.set("zone", isValidZone(input.zone) ? input.zone : localZone());
+        row2.set("zone", zone);
         row2.set("repeat", "none");
-        apply(row2, { ...input, start, end });
+        apply(row2, { ...checked, start, end });
         map.set(id, row2);
       });
       return get(id);
@@ -26691,10 +26595,16 @@ function createMeetingStore(doc, user, now = Date.now) {
       if (end <= start || end - start > MAX_MEETING_HOURS * 36e5) return null;
       if (patch.title !== void 0 && !sanitizeChannelName(patch.title)) return null;
       const repeat = patch.repeat ?? current.repeat;
+      const zone = patch.zone !== void 0 && isValidZone(patch.zone) ? patch.zone : current.zone;
+      const by = patch.monthlyBy ?? current.monthlyBy;
+      const checked = withOrdinal(patch, repeat, by, current.ordinal, start, zone);
+      if (!checked) return null;
+      patch = checked;
+      const sameShape = (by ?? "date") === (current.monthlyBy ?? "date") && (patch.ordinal === void 0 || patch.ordinal === current.ordinal);
       if (typeof patch.until === "number" && repeat !== "none" && patch.until < start) return null;
       doc.transact(() => {
         apply(row2, patch);
-        if (repeat === "none" || start !== current.start || repeat !== current.repeat)
+        if (repeat === "none" || start !== current.start || repeat !== current.repeat || !sameShape)
           row2.delete("exceptions");
         if (repeat === "none") {
           row2.delete("until");
@@ -27123,31 +27033,101 @@ function trimTrailingSlashes(value) {
 }
 
 // teams/server-session.ts
+var TeamsSignInError = class extends Error {
+  reason;
+  retryAfterSec;
+  constructor(reason, message, retryAfterSec) {
+    super(message);
+    this.name = "TeamsSignInError";
+    this.reason = reason;
+    this.retryAfterSec = retryAfterSec;
+  }
+};
 async function requestTeamsSession(config, credentials, options = {}) {
-  const base = config.syncUrl ?? config.signalingUrl;
-  if (config.mode !== "server" || !base) throw new Error("Configure a server before signing in");
-  const target = new URL(base);
-  target.protocol = target.protocol === "wss:" ? "https:" : "http:";
-  const response = await (options.fetch ?? globalThis.fetch)(`${target.origin}/auth/session`, {
-    method: "POST",
-    redirect: "error",
-    credentials: "omit",
-    headers: {
-      "Content-Type": "application/json",
-      ...config.token ? { Authorization: `Bearer ${config.token}` } : {}
-    },
-    body: JSON.stringify({
-      user: credentials.userId,
-      ...credentials.credential === void 0 ? {} : { credential: credentials.credential }
-    }),
-    ...options.signal ? { signal: options.signal } : {}
-  });
-  if (!response.ok) throw new Error(`Sign-in failed (${response.status})`);
+  const origin = serverOrigin(config);
+  if (!origin) throw new Error("Configure a server before signing in");
+  let response;
+  try {
+    response = await sessionFetch(options)(`${origin}/auth/session`, {
+      method: "POST",
+      redirect: "error",
+      credentials: "omit",
+      headers: jsonHeaders(config),
+      body: JSON.stringify({
+        user: credentials.userId,
+        ...credentials.credential === void 0 ? {} : { credential: credentials.credential }
+      }),
+      ...options.signal ? { signal: options.signal } : {}
+    });
+  } catch (error) {
+    if (options.signal?.aborted) throw error;
+    throw new TeamsSignInError("network", "Could not reach the server");
+  }
+  if (!response.ok) {
+    const wait = Number(response.headers.get("Retry-After"));
+    throw new TeamsSignInError(
+      response.status === 429 ? "rate-limited" : response.status === 401 || response.status === 400 ? "credentials" : "server",
+      `Sign-in failed (${response.status})`,
+      response.status === 429 && Number.isFinite(wait) && wait > 0 ? Math.ceil(wait) : void 0
+    );
+  }
   const body = await response.json();
   if (typeof body.session !== "string" || typeof body.user !== "string" || typeof body.expiresAt !== "number")
     throw new Error("Server returned an invalid session");
   return { token: body.session, userId: body.user, expiresAt: body.expiresAt };
 }
+function serverOrigin(config) {
+  const base = config.syncUrl ?? config.signalingUrl;
+  if (config.mode !== "server" || !base) return null;
+  const target = new URL(base);
+  target.protocol = target.protocol === "wss:" ? "https:" : "http:";
+  return target.origin;
+}
+var sessionFetch = (options) => options.fetch ?? globalThis.fetch.bind(globalThis);
+var jsonHeaders = (config) => ({
+  "Content-Type": "application/json",
+  ...config.token ? { Authorization: `Bearer ${config.token}` } : {}
+});
+async function probeTeamsAccounts(config, options = {}) {
+  const origin = serverOrigin(config);
+  if (!origin) return null;
+  try {
+    const response = await sessionFetch(options)(`${origin}/health`, {
+      redirect: "error",
+      credentials: "omit",
+      ...options.signal ? { signal: options.signal } : {}
+    });
+    if (!response.ok) return null;
+    const body = await response.json();
+    return typeof body.accounts === "boolean" ? body.accounts : false;
+  } catch {
+    return null;
+  }
+}
+async function checkTeamsSession(config, session, options = {}) {
+  return postSession(config, "/auth/check", session, options);
+}
+async function signOutTeamsSession(config, session, options = {}) {
+  return postSession(config, "/auth/signout", session, options);
+}
+async function postSession(config, path2, session, options) {
+  const origin = serverOrigin(config);
+  if (!origin) return "unreachable";
+  try {
+    const response = await sessionFetch(options)(`${origin}${path2}`, {
+      method: "POST",
+      redirect: "error",
+      credentials: "omit",
+      headers: jsonHeaders(config),
+      body: JSON.stringify({ session }),
+      ...options.signal ? { signal: options.signal } : {}
+    });
+    if (response.ok) return "valid";
+    return response.status === 401 ? "rejected" : "unreachable";
+  } catch {
+    return "unreachable";
+  }
+}
 
 // teams/server-file-storage.ts
 async function uploadTeamsServerFile(config, workspaceId, file, options = {}) {
@@ -28054,12 +28034,12 @@ function parseSignal(input) {
     case "candidate": {
       const c2 = r.candidate;
       if (!to || !c2 || typeof c2.candidate !== "string" || c2.candidate.length > 2048) return null;
-      const candidate = { candidate: c2.candidate };
-      if (typeof c2.sdpMid === "string" || c2.sdpMid === null) candidate.sdpMid = c2.sdpMid;
+      const candidate2 = { candidate: c2.candidate };
+      if (typeof c2.sdpMid === "string" || c2.sdpMid === null) candidate2.sdpMid = c2.sdpMid;
       if (typeof c2.sdpMLineIndex === "number" || c2.sdpMLineIndex === null)
-        candidate.sdpMLineIndex = c2.sdpMLineIndex;
-      if (typeof c2.usernameFragment === "string") candidate.usernameFragment = c2.usernameFragment;
-      return { type: "candidate", from, to, candidate };
+        candidate2.sdpMLineIndex = c2.sdpMLineIndex;
+      if (typeof c2.usernameFragment === "string") candidate2.usernameFragment = c2.usernameFragment;
+      return { type: "candidate", from, to, candidate: candidate2 };
     }
     default:
       return null;
@@ -29797,4 +29777,4 @@ function sortFiles(files, field, direction) {
   });
 }
 
-export { ACTIVITY_FILTERS, CHAT_MEMBERS_MAP, DAY_MS, DEFAULT_ICE_SERVERS, DEFAULT_IDLE_MINUTES, DEFAULT_NOTIFICATION_SETTINGS, GROUP_MENTIONS, HOUR_MS, IDLE_MINUTE_CHOICES, MAX_ACTIVITY_ITEMS, MAX_ATTACHMENTS, MAX_CHANNEL_NAME_CHARS, MAX_CHANNEL_TOPIC_CHARS, MAX_CHAT_MEMBERS, MAX_MEETING_DESCRIPTION, MAX_MEETING_HOURS, MAX_MEETING_TITLE, MAX_MENTIONS, MAX_MESSAGE_CHARS, MAX_PINNED_MESSAGES, MAX_RECURRENCE_COUNT, MAX_SDP_CHARS, MAX_SHARED_CHAT_CHARS, MAX_SHARED_CHAT_DATA_CHARS, MAX_SHARED_CHAT_TITLE_CHARS, MAX_SIGNAL_CHARS, MAX_STATUS_MESSAGE_CHARS, MEETING_REPEATS, MINUTE_MS, NOTIFICATION_LEVELS, PRESENCE_LABELS, PRESENCE_STATUSES, REMINDER_LEAD_MS, STATUS_DURATIONS, STATUS_DURATION_LABELS, activityPreview, addDays, allFilesOf, applyExpiry, callRoomId, channelThreads, channelViews, chatRoomId, chatTitle, chatViews, contactViews, contentUrl, createBroadcastSignaling, createCallSession, createChatDirectory, createChatRooms, createChatStore, createMeetingStore, createMemorySignalingHub, createNotificationSettings, createPeer, createPinStore, createPresenceController, createRoster, createSharedChat, createSharedChatStore, createSyncTransport, createTabStore, createTeamsClient, createTeamsWorkspace, createWebSocketSignaling, dayKey, defaultPresenceSetting, deriveActivity, describeActivity, detectContentKind, detectOfficeKind, directChatId, effectiveStatus, endpointUrl, expiryFor, filesOf, filterActivity, filterFiles, filterMentionTargets, icsDateTime, icsEscape, icsFileName, icsFold, icsLocal, icsOffset, icsUtc, insertMention, isChatMember, isChatUserId, isIdle, isNotificationLevel, isPresenceStatus, isSharedChatRoomId, isStatusDuration, isValidZone, layoutDay, legacyAvailability, localServerConfig, localZone, markdownBlocks, markdownInline, markdownUrl, meetingCallKey, meetingChatId, meetingToIcs, meetingVisibleTo, memberPresence, mentionDisplayText, mentionQueryAt, mentionSegments, mentionTargetsFor, mentionsUser, minuteOfDay, nextExpiry, normalizeIdleMinutes, occurrenceAt, occurrencesBetween, offsetMinutes, parsePresenceSetting, parseServerConfig, parseSignal, peopleViews, promoteMentions, readContent, remindersDue, requestTeamsSession, resolveMentions, sanitizeAttachment, sanitizeAttachments, sanitizeChannelName, sanitizeChannelTopic, sanitizeEmoji, sanitizeMembers, sanitizeMentionName, sanitizeMentionTarget, sanitizeMentions, sanitizeMessageText, sanitizeStatusMessage, searchMessages, seriesBetween, seriesIndexOf, seriesStart, sharedChatRoomId, shiftAnchor, shortHash, shouldNotify, sortFiles, startOfDay, statusFromWire, tabConversationId, typingNames, uploadTeamsServerFile, viewDays, vtimezoneLines, withinSeries, zoneTransitions, zonedParts, zonedToUtc };
+export { ACTIVITY_FILTERS, CHAT_MEMBERS_MAP, DAY_MS, DEFAULT_ICE_SERVERS, DEFAULT_IDLE_MINUTES, DEFAULT_NOTIFICATION_SETTINGS, GROUP_MENTIONS, HOUR_MS, IDLE_MINUTE_CHOICES, MAX_ACTIVITY_ITEMS, MAX_ATTACHMENTS, MAX_CHANNEL_NAME_CHARS, MAX_CHANNEL_TOPIC_CHARS, MAX_CHAT_MEMBERS, MAX_MEETING_DESCRIPTION, MAX_MEETING_HOURS, MAX_MEETING_TITLE, MAX_MENTIONS, MAX_MESSAGE_CHARS, MAX_PINNED_MESSAGES, MAX_RECURRENCE_COUNT, MAX_SDP_CHARS, MAX_SHARED_CHAT_CHARS, MAX_SHARED_CHAT_DATA_CHARS, MAX_SHARED_CHAT_TITLE_CHARS, MAX_SIGNAL_CHARS, MAX_STATUS_MESSAGE_CHARS, MEETING_REPEATS, MINUTE_MS, NOTIFICATION_LEVELS, PRESENCE_LABELS, PRESENCE_STATUSES, REMINDER_LEAD_MS, STATUS_DURATIONS, STATUS_DURATION_LABELS, TeamsSignInError, WEEKDAY_ORDINALS, activityPreview, addDays, allFilesOf, applyExpiry, calendarSlots, callRoomId, channelThreads, channelViews, chatRoomId, chatTitle, chatViews, checkTeamsSession, contactViews, contentUrl, createBroadcastSignaling, createCallSession, createChatDirectory, createChatRooms, createChatStore, createMeetingStore, createMemorySignalingHub, createNotificationSettings, createPeer, createPinStore, createPresenceController, createRoster, createSharedChat, createSharedChatStore, createSyncTransport, createTabStore, createTeamsClient, createTeamsWorkspace, createWebSocketSignaling, dayKey, dayMatchesOrdinal, daysInMonth, defaultPresenceSetting, deriveActivity, describeActivity, detectContentKind, detectOfficeKind, directChatId, effectiveStatus, endpointUrl, expiryFor, filesOf, filterActivity, filterFiles, filterMentionTargets, icsDateTime, icsEscape, icsFileName, icsFold, icsLocal, icsOffset, icsUtc, insertMention, isCalendarRepeat, isChatMember, isChatUserId, isIdle, isNotificationLevel, isPresenceStatus, isSharedChatRoomId, isStatusDuration, isValidZone, layoutDay, legacyAvailability, localServerConfig, localZone, markdownBlocks, markdownInline, markdownUrl, meetingCallKey, meetingChatId, meetingToIcs, meetingVisibleTo, memberPresence, mentionDisplayText, mentionQueryAt, mentionSegments, mentionTargetsFor, mentionsUser, minuteOfDay, nextExpiry, normalizeIdleMinutes, nthWeekdayOfMonth, occurrenceAt, occurrencesBetween, offsetMinutes, ordinalOfDay, parsePresenceSetting, parseServerConfig, parseSignal, peopleViews, probeTeamsAccounts, promoteMentions, readContent, remindersDue, repeatChoices, requestTeamsSession, resolveMentions, sanitizeAttachment, sanitizeAttachments, sanitizeChannelName, sanitizeChannelTopic, sanitizeEmoji, sanitizeMembers, sanitizeMentionName, sanitizeMentionTarget, sanitizeMentions, sanitizeMessageText, sanitizeStatusMessage, searchMessages, seriesBetween, seriesIndexOf, seriesStart, serverOrigin, sharedChatRoomId, shiftAnchor, shortHash, shouldNotify, signOutTeamsSession, slotAt, slotStart, slotStarting, sortFiles, startOfDay, statusFromWire, tabConversationId, typingNames, uploadTeamsServerFile, viewDays, vtimezoneLines, withinSeries, zoneTransitions, zonedParts, zonedToUtc };