ooxml-core 1.35.0 → 1.37.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (271) hide show
  1. package/dist/PptxHandler-2JSQ22VD.cjs +14 -0
  2. package/dist/{PptxHandler-XCYX5DVX.mjs → PptxHandler-3T5DTNKA.mjs} +2 -2
  3. package/dist/PptxHandler-7T7ZS7IK.mjs +5 -0
  4. package/dist/{PresentationBuilder-JBTNOIL7.mjs → PresentationBuilder-D6ZICJWN.mjs} +3 -3
  5. package/dist/{PresentationBuilder-HA56ZY23.cjs → PresentationBuilder-HCMXZQDK.cjs} +6 -6
  6. package/dist/{PresentationBuilder-IVLUEB4K.mjs → PresentationBuilder-XHKNDJMD.mjs} +2 -2
  7. package/dist/automation/index.cjs +20529 -17975
  8. package/dist/automation/index.mjs +20510 -17975
  9. package/dist/chart/index.cjs +1 -1
  10. package/dist/chart/index.mjs +1 -1
  11. package/dist/chart/region-map/index.cjs +1 -1
  12. package/dist/chart/region-map/index.mjs +1 -1
  13. package/dist/{chunk-UQMAPY6D.mjs → chunk-2TQJHNVU.mjs} +1 -1
  14. package/dist/{chunk-RI56PFGL.mjs → chunk-4YBSHQ76.mjs} +5 -5
  15. package/dist/{chunk-XF6ZRA2D.cjs → chunk-AFALJ5TA.cjs} +3 -3
  16. package/dist/{chunk-MK2IBZU6.mjs → chunk-CNIKTXAV.mjs} +1 -1
  17. package/dist/{chunk-PA5ADSTX.cjs → chunk-GZOYXHDF.cjs} +1269 -1269
  18. package/dist/{chunk-LSO5SSFX.mjs → chunk-H2Q42P6P.mjs} +1 -1
  19. package/dist/{chunk-EGBNPVBA.mjs → chunk-J43V3QOA.mjs} +2 -2
  20. package/dist/{chunk-TJXK4D4U.mjs → chunk-M2DFN3SP.mjs} +4 -4
  21. package/dist/{chunk-RPJHMPEL.mjs → chunk-OEM2ECAJ.mjs} +1 -1
  22. package/dist/{chunk-GNGL4BO7.mjs → chunk-RHQQS6LJ.mjs} +4 -4
  23. package/dist/{chunk-A27O7M5X.cjs → chunk-SNID2FDY.cjs} +1 -1
  24. package/dist/{chunk-EDRS3OSM.mjs → chunk-WNAPUUAT.mjs} +1 -0
  25. package/dist/color/theme-palette.d.ts +1 -1
  26. package/dist/color/theme-palette.d.ts.map +1 -1
  27. package/dist/crypto/index.cjs +1 -1
  28. package/dist/crypto/index.mjs +1 -1
  29. package/dist/diagram/index.cjs +1 -1
  30. package/dist/diagram/index.mjs +1 -1
  31. package/dist/docx/block-parser.d.ts.map +1 -1
  32. package/dist/docx/comment-parts.d.ts +33 -0
  33. package/dist/docx/comment-parts.d.ts.map +1 -0
  34. package/dist/docx/comments.d.ts +5 -2
  35. package/dist/docx/comments.d.ts.map +1 -1
  36. package/dist/docx/embedded.cjs +15231 -14731
  37. package/dist/docx/embedded.mjs +15231 -14731
  38. package/dist/docx/glossary.d.ts.map +1 -1
  39. package/dist/docx/index.cjs +10771 -10329
  40. package/dist/docx/index.mjs +10771 -10329
  41. package/dist/docx/layout/index.cjs +81 -73
  42. package/dist/docx/layout/index.mjs +81 -73
  43. package/dist/docx/load/index.cjs +16891 -16391
  44. package/dist/docx/load/index.mjs +16891 -16391
  45. package/dist/docx/page-background.d.ts +4 -3
  46. package/dist/docx/page-background.d.ts.map +1 -1
  47. package/dist/docx/paragraph-text.d.ts +5 -0
  48. package/dist/docx/paragraph-text.d.ts.map +1 -0
  49. package/dist/docx/parse.d.ts.map +1 -1
  50. package/dist/docx/save.d.ts.map +1 -1
  51. package/dist/docx/special-characters.d.ts +2 -0
  52. package/dist/docx/special-characters.d.ts.map +1 -1
  53. package/dist/docx/theme-color.d.ts.map +1 -1
  54. package/dist/docx/ui/index.cjs +135 -135
  55. package/dist/docx/ui/index.mjs +135 -135
  56. package/dist/docx/write-comment-identities.d.ts +8 -0
  57. package/dist/docx/write-comment-identities.d.ts.map +1 -0
  58. package/dist/docx/write-comment-metadata.d.ts +12 -0
  59. package/dist/docx/write-comment-metadata.d.ts.map +1 -0
  60. package/dist/docx/write-comment-text.d.ts +3 -0
  61. package/dist/docx/write-comment-text.d.ts.map +1 -0
  62. package/dist/docx/write-comments.d.ts +1 -4
  63. package/dist/docx/write-comments.d.ts.map +1 -1
  64. package/dist/drawingml/index.cjs +1 -1
  65. package/dist/drawingml/index.mjs +1 -1
  66. package/dist/index.cjs +110 -6
  67. package/dist/index.mjs +91 -6
  68. package/dist/math/index.cjs +1 -1
  69. package/dist/math/index.mjs +1 -1
  70. package/dist/opc/index.cjs +78 -3
  71. package/dist/opc/index.mjs +78 -3
  72. package/dist/opc/signature/index.d.ts +1 -0
  73. package/dist/opc/signature/index.d.ts.map +1 -1
  74. package/dist/opc/signature/package.d.ts +12 -0
  75. package/dist/opc/signature/package.d.ts.map +1 -0
  76. package/dist/pptx/automation/index.cjs +21 -4
  77. package/dist/pptx/automation/index.d.ts +1 -0
  78. package/dist/pptx/automation/index.d.ts.map +1 -1
  79. package/dist/pptx/automation/index.mjs +16 -6
  80. package/dist/pptx/automation/schemas/index.cjs +1 -0
  81. package/dist/pptx/automation/schemas/index.mjs +1 -1
  82. package/dist/pptx/automation/schemas/presentation-schemas.cjs +1 -0
  83. package/dist/pptx/automation/schemas/presentation-schemas.d.ts +1 -0
  84. package/dist/pptx/automation/schemas/presentation-schemas.d.ts.map +1 -1
  85. package/dist/pptx/automation/schemas/presentation-schemas.mjs +1 -1
  86. package/dist/pptx/cli/index.cjs +10 -4
  87. package/dist/pptx/cli/index.mjs +4 -4
  88. package/dist/pptx/converter/index.cjs +7 -1
  89. package/dist/pptx/converter/index.mjs +2 -2
  90. package/dist/pptx/editor/render/custom-show-operations.cjs +2 -2
  91. package/dist/pptx/editor/render/custom-show-operations.mjs +1 -1
  92. package/dist/pptx/editor/render/find-replace.cjs +15 -15
  93. package/dist/pptx/editor/render/find-replace.mjs +2 -2
  94. package/dist/pptx/editor/render/slide-operations.cjs +9 -9
  95. package/dist/pptx/editor/render/slide-operations.mjs +3 -3
  96. package/dist/pptx/index.cjs +10 -4
  97. package/dist/pptx/index.mjs +5 -5
  98. package/dist/pptx/ui/index.d.ts +1 -1
  99. package/dist/teams/index.cjs +812 -95
  100. package/dist/teams/index.mjs +811 -95
  101. package/dist/visio/bevel-3d.d.ts +37 -14
  102. package/dist/visio/bevel-3d.d.ts.map +1 -1
  103. package/dist/visio/bevel-shading.d.ts +72 -0
  104. package/dist/visio/bevel-shading.d.ts.map +1 -0
  105. package/dist/visio/cff-author.d.ts +14 -0
  106. package/dist/visio/cff-author.d.ts.map +1 -0
  107. package/dist/visio/cff-masters.d.ts +11 -0
  108. package/dist/visio/cff-masters.d.ts.map +1 -1
  109. package/dist/visio/cff-recalc.d.ts.map +1 -1
  110. package/dist/visio/collab/index.cjs +1 -1
  111. package/dist/visio/collab/index.mjs +1 -1
  112. package/dist/visio/data-graphic-instance.d.ts +44 -0
  113. package/dist/visio/data-graphic-instance.d.ts.map +1 -0
  114. package/dist/visio/data-graphic-masters.d.ts +38 -0
  115. package/dist/visio/data-graphic-masters.d.ts.map +1 -0
  116. package/dist/visio/data-graphic-place.d.ts +34 -0
  117. package/dist/visio/data-graphic-place.d.ts.map +1 -0
  118. package/dist/visio/edit-commands.d.ts +10 -1
  119. package/dist/visio/edit-commands.d.ts.map +1 -1
  120. package/dist/visio/edit-data-graphic-guard.d.ts +13 -0
  121. package/dist/visio/edit-data-graphic-guard.d.ts.map +1 -0
  122. package/dist/visio/edit-data-graphic-owner.d.ts +9 -0
  123. package/dist/visio/edit-data-graphic-owner.d.ts.map +1 -0
  124. package/dist/visio/edit-data-graphic-refresh.d.ts +14 -0
  125. package/dist/visio/edit-data-graphic-refresh.d.ts.map +1 -0
  126. package/dist/visio/edit-data-graphic.d.ts +33 -0
  127. package/dist/visio/edit-data-graphic.d.ts.map +1 -0
  128. package/dist/visio/edit-formatting-commands.d.ts +6 -0
  129. package/dist/visio/edit-formatting-commands.d.ts.map +1 -1
  130. package/dist/visio/edit-formatting-paint.d.ts.map +1 -1
  131. package/dist/visio/edit-formatting-text-commands.d.ts +8 -0
  132. package/dist/visio/edit-formatting-text-commands.d.ts.map +1 -1
  133. package/dist/visio/edit-formatting-text-extra.d.ts +14 -0
  134. package/dist/visio/edit-formatting-text-extra.d.ts.map +1 -1
  135. package/dist/visio/edit-formatting-text.d.ts.map +1 -1
  136. package/dist/visio/edit-formatting.d.ts.map +1 -1
  137. package/dist/visio/edit-instance-geometry.d.ts.map +1 -1
  138. package/dist/visio/edit-instance-recalculate.d.ts +6 -1
  139. package/dist/visio/edit-instance-recalculate.d.ts.map +1 -1
  140. package/dist/visio/edit-shape-create.d.ts.map +1 -1
  141. package/dist/visio/edit-shape-data.d.ts.map +1 -1
  142. package/dist/visio/edit-stencil-connector.d.ts.map +1 -1
  143. package/dist/visio/edit-swimlane-cff.d.ts +28 -0
  144. package/dist/visio/edit-swimlane-cff.d.ts.map +1 -0
  145. package/dist/visio/edit-swimlane-clone.d.ts +8 -4
  146. package/dist/visio/edit-swimlane-clone.d.ts.map +1 -1
  147. package/dist/visio/edit-swimlane-layout.d.ts +6 -1
  148. package/dist/visio/edit-swimlane-layout.d.ts.map +1 -1
  149. package/dist/visio/edit-swimlane-ops.d.ts.map +1 -1
  150. package/dist/visio/edit-swimlane-stamp.d.ts +22 -0
  151. package/dist/visio/edit-swimlane-stamp.d.ts.map +1 -0
  152. package/dist/visio/edit.d.ts.map +1 -1
  153. package/dist/visio/formula-analyze.d.ts.map +1 -1
  154. package/dist/visio/formula-evaluate.d.ts.map +1 -1
  155. package/dist/visio/formula.d.ts.map +1 -1
  156. package/dist/visio/index.cjs +4279 -2236
  157. package/dist/visio/index.d.ts +4 -1
  158. package/dist/visio/index.d.ts.map +1 -1
  159. package/dist/visio/index.mjs +4262 -2237
  160. package/dist/visio/master-list.d.ts +3 -3
  161. package/dist/visio/master-list.d.ts.map +1 -1
  162. package/dist/visio/model.d.ts +12 -3
  163. package/dist/visio/model.d.ts.map +1 -1
  164. package/dist/visio/path-segments.d.ts +25 -0
  165. package/dist/visio/path-segments.d.ts.map +1 -0
  166. package/dist/visio/rotation-presets.d.ts +25 -0
  167. package/dist/visio/rotation-presets.d.ts.map +1 -0
  168. package/dist/visio/shape-sections.d.ts +4 -3
  169. package/dist/visio/shape-sections.d.ts.map +1 -1
  170. package/dist/visio/shape-structure.d.ts.map +1 -1
  171. package/dist/visio/shapes.d.ts +2 -0
  172. package/dist/visio/shapes.d.ts.map +1 -1
  173. package/dist/visio/solid-3d.d.ts +64 -0
  174. package/dist/visio/solid-3d.d.ts.map +1 -0
  175. package/dist/visio/style.d.ts.map +1 -1
  176. package/dist/visio/theme-solid.d.ts +21 -0
  177. package/dist/visio/theme-solid.d.ts.map +1 -0
  178. package/dist/visio/ui/data-graphic-config.d.ts +4 -19
  179. package/dist/visio/ui/data-graphic-config.d.ts.map +1 -1
  180. package/dist/visio/ui/data-graphic-items.d.ts.map +1 -1
  181. package/dist/visio/ui/data-graphic-native.d.ts +20 -0
  182. package/dist/visio/ui/data-graphic-native.d.ts.map +1 -0
  183. package/dist/visio/ui/data-graphics.d.ts.map +1 -1
  184. package/dist/visio/ui/data-visualizer-edits.d.ts +1 -0
  185. package/dist/visio/ui/data-visualizer-edits.d.ts.map +1 -1
  186. package/dist/visio/ui/edit-commands.d.ts.map +1 -1
  187. package/dist/visio/ui/index.cjs +4273 -2347
  188. package/dist/visio/ui/index.mjs +4270 -2348
  189. package/dist/visio/ui/org-chart-belt.d.ts +20 -0
  190. package/dist/visio/ui/org-chart-belt.d.ts.map +1 -0
  191. package/dist/visio/ui/org-chart-edit.d.ts +8 -1
  192. package/dist/visio/ui/org-chart-edit.d.ts.map +1 -1
  193. package/dist/visio/ui/org-chart-import.d.ts.map +1 -1
  194. package/dist/visio/ui/scene-validation.d.ts.map +1 -1
  195. package/dist/visio/ui/snapshot-scene.d.ts.map +1 -1
  196. package/dist/visio/ui/swimlane.d.ts.map +1 -1
  197. package/dist/visio/ui/text-dialog.d.ts +12 -0
  198. package/dist/visio/ui/text-dialog.d.ts.map +1 -1
  199. package/dist/xlsx/collab/index.cjs +45 -2
  200. package/dist/xlsx/collab/index.mjs +45 -2
  201. package/dist/xlsx/collab/part-specs.d.ts.map +1 -1
  202. package/dist/xlsx/collab/sheets.d.ts +1 -0
  203. package/dist/xlsx/collab/sheets.d.ts.map +1 -1
  204. package/dist/xlsx/edit/annotations.d.ts +4 -0
  205. package/dist/xlsx/edit/annotations.d.ts.map +1 -1
  206. package/dist/xlsx/edit/clipboard-annotations.d.ts.map +1 -1
  207. package/dist/xlsx/edit/comment-identities.d.ts +4 -0
  208. package/dist/xlsx/edit/comment-identities.d.ts.map +1 -0
  209. package/dist/xlsx/edit/session.d.ts.map +1 -1
  210. package/dist/xlsx/edit/sheets.d.ts.map +1 -1
  211. package/dist/xlsx/edit/types.d.ts +3 -0
  212. package/dist/xlsx/edit/types.d.ts.map +1 -1
  213. package/dist/xlsx/formula/functions/filterxml.d.ts +2 -0
  214. package/dist/xlsx/formula/functions/filterxml.d.ts.map +1 -0
  215. package/dist/xlsx/formula/functions/registry.d.ts.map +1 -1
  216. package/dist/xlsx/index.cjs +1007 -285
  217. package/dist/xlsx/index.mjs +988 -285
  218. package/dist/xlsx/layout/split.d.ts +3 -1
  219. package/dist/xlsx/layout/split.d.ts.map +1 -1
  220. package/dist/xlsx/load/index.cjs +809 -126
  221. package/dist/xlsx/load/index.mjs +790 -126
  222. package/dist/xlsx/model.d.ts +19 -7
  223. package/dist/xlsx/model.d.ts.map +1 -1
  224. package/dist/xlsx/read/comments.d.ts +3 -1
  225. package/dist/xlsx/read/comments.d.ts.map +1 -1
  226. package/dist/xlsx/read/conditional.d.ts +2 -2
  227. package/dist/xlsx/read/conditional.d.ts.map +1 -1
  228. package/dist/xlsx/read/data-validations.d.ts +7 -0
  229. package/dist/xlsx/read/data-validations.d.ts.map +1 -0
  230. package/dist/xlsx/read/sheet-props.d.ts.map +1 -1
  231. package/dist/xlsx/read/worksheet.d.ts.map +1 -1
  232. package/dist/xlsx/ui/commands/i18n/messages.d.ts.map +1 -1
  233. package/dist/xlsx/ui/commands/i18n/navigation.d.ts.map +1 -1
  234. package/dist/xlsx/ui/grid/geometry.d.ts +3 -0
  235. package/dist/xlsx/ui/grid/geometry.d.ts.map +1 -1
  236. package/dist/xlsx/ui/index.cjs +952 -168
  237. package/dist/xlsx/ui/index.mjs +933 -169
  238. package/dist/xlsx/ui/selection.d.ts +3 -0
  239. package/dist/xlsx/ui/selection.d.ts.map +1 -1
  240. package/dist/xlsx/validation-extensions.d.ts +6 -0
  241. package/dist/xlsx/validation-extensions.d.ts.map +1 -0
  242. package/dist/xlsx/write/comment-ids.d.ts +14 -0
  243. package/dist/xlsx/write/comment-ids.d.ts.map +1 -0
  244. package/dist/xlsx/write/comment-mentions.d.ts +6 -0
  245. package/dist/xlsx/write/comment-mentions.d.ts.map +1 -0
  246. package/dist/xlsx/write/comment-persons.d.ts +16 -0
  247. package/dist/xlsx/write/comment-persons.d.ts.map +1 -0
  248. package/dist/xlsx/write/comments.d.ts +5 -11
  249. package/dist/xlsx/write/comments.d.ts.map +1 -1
  250. package/dist/xlsx/write/conditional.d.ts +2 -2
  251. package/dist/xlsx/write/conditional.d.ts.map +1 -1
  252. package/dist/xlsx/write/data-validations.d.ts +6 -0
  253. package/dist/xlsx/write/data-validations.d.ts.map +1 -0
  254. package/dist/xlsx/write/save.d.ts.map +1 -1
  255. package/dist/xlsx/write/sheet-parts.d.ts +4 -0
  256. package/dist/xlsx/write/sheet-parts.d.ts.map +1 -1
  257. package/dist/xlsx/write/sheet-props.d.ts.map +1 -1
  258. package/dist/xlsx/write/threaded-comments.d.ts +19 -0
  259. package/dist/xlsx/write/threaded-comments.d.ts.map +1 -0
  260. package/dist/xlsx/write/worksheet.d.ts.map +1 -1
  261. package/dist/xml/index.cjs +31 -1
  262. package/dist/xml/index.d.ts +1 -0
  263. package/dist/xml/index.d.ts.map +1 -1
  264. package/dist/xml/index.mjs +11 -2
  265. package/dist/xml/xml.d.ts +2 -0
  266. package/dist/xml/xml.d.ts.map +1 -1
  267. package/dist/xml/xpath.d.ts +9 -0
  268. package/dist/xml/xpath.d.ts.map +1 -0
  269. package/package.json +2 -1
  270. package/dist/PptxHandler-5UDSMCBG.cjs +0 -14
  271. package/dist/PptxHandler-TTRTAQAR.mjs +0 -5
@@ -1,6 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var xmldom = require('@xmldom/xmldom');
4
+ var xpath = require('xpath');
4
5
  var JSZip3 = require('jszip');
5
6
  var Y15 = require('yjs');
6
7
  var decoding = require('lib0/decoding');
@@ -27,6 +28,7 @@ function _interopNamespace(e) {
27
28
  return Object.freeze(n);
28
29
  }
29
30
 
31
+ var xpath__namespace = /*#__PURE__*/_interopNamespace(xpath);
30
32
  var JSZip3__default = /*#__PURE__*/_interopDefault(JSZip3);
31
33
  var Y15__namespace = /*#__PURE__*/_interopNamespace(Y15);
32
34
  var decoding__namespace = /*#__PURE__*/_interopNamespace(decoding);
@@ -482,7 +484,7 @@ function parseXml(xml, options = {}) {
482
484
  try {
483
485
  parsed = new xmldom.DOMParser({
484
486
  onError: (level4, message) => {
485
- if (level4 !== "warning") parseError = message;
487
+ if (level4 !== "warning" || options.warningsAsErrors) parseError = message;
486
488
  }
487
489
  }).parseFromString(xml, "application/xml");
488
490
  } catch (error) {
@@ -549,6 +551,19 @@ var init_lite = __esm({
549
551
  "xml/lite.ts"() {
550
552
  }
551
553
  });
554
+ function selectXmlNodes(expression, node2, options = {}) {
555
+ return compiler.parse(expression).select({
556
+ node: node2,
557
+ ...options.namespaces ? { namespaces: options.namespaces } : {},
558
+ allowAnyNamespaceForNoPrefix: options.matchDefaultNamespace ?? false
559
+ });
560
+ }
561
+ var compiler;
562
+ var init_xpath = __esm({
563
+ "xml/xpath.ts"() {
564
+ compiler = xpath__namespace;
565
+ }
566
+ });
552
567
 
553
568
  // xml/index.ts
554
569
  var init_xml2 = __esm({
@@ -556,6 +571,7 @@ var init_xml2 = __esm({
556
571
  init_namespaces();
557
572
  init_xml();
558
573
  init_lite();
574
+ init_xpath();
559
575
  }
560
576
  });
561
577
 
@@ -1314,31 +1330,90 @@ function parsePersons(xml) {
1314
1330
  }
1315
1331
  return persons;
1316
1332
  }
1317
- function parseThreadedComments(xml, persons) {
1333
+ function parseThreadedComments(xml, persons, personsXml) {
1318
1334
  if (!xml) return [];
1319
1335
  const root = parseXml(xml, { label: "XLSX threaded comments" }).documentElement;
1320
1336
  const roots = /* @__PURE__ */ new Map();
1337
+ const personNames = new Map([...persons].map(([id, name2]) => [id.toUpperCase(), name2]));
1321
1338
  const order = [];
1322
- for (const node2 of children(root, "threadedComment", NS.tc)) {
1323
- const address2 = parseAddress(att(node2, "ref") ?? "");
1339
+ const nodes = children(root, "threadedComment", NS.tc);
1340
+ const byId = new Map(nodes.map((node2) => [(att(node2, "id") ?? "").toUpperCase(), node2]));
1341
+ const parentRoot = (parent) => {
1342
+ const seen = /* @__PURE__ */ new Set();
1343
+ while (parent) {
1344
+ parent = parent.toUpperCase();
1345
+ if (seen.has(parent)) break;
1346
+ if (roots.has(parent)) return roots.get(parent);
1347
+ seen.add(parent);
1348
+ parent = att(byId.get(parent), "parentId");
1349
+ }
1350
+ return void 0;
1351
+ };
1352
+ for (const node2 of [
1353
+ ...nodes.filter((n) => !att(n, "parentId")),
1354
+ ...nodes.filter((n) => att(n, "parentId"))
1355
+ ]) {
1356
+ const parentComment = parentRoot(att(node2, "parentId"));
1357
+ const address2 = parseAddress(att(node2, "ref") ?? "") ?? parentComment?.address;
1324
1358
  if (!address2) continue;
1325
- const author = persons.get(att(node2, "personId") ?? "") ?? "";
1359
+ const author = personNames.get((att(node2, "personId") ?? "").toUpperCase()) ?? "";
1326
1360
  const text = xText(children(node2, "text", NS.tc)[0]);
1327
1361
  const date = att(node2, "dT");
1328
- const parent = att(node2, "parentId");
1329
- const parentComment = parent ? roots.get(parent) : void 0;
1330
1362
  if (parentComment) {
1331
- const reply = { author, text };
1363
+ const reply = { author, text, threadedXml: selfContainedXml(node2) };
1332
1364
  if (date) reply.date = date;
1333
1365
  (parentComment.replies ??= []).push(reply);
1334
1366
  continue;
1335
1367
  }
1336
- const comment = { address: address2, author, text, replies: [] };
1337
- roots.set(att(node2, "id") ?? `${order.length}`, comment);
1368
+ const comment = {
1369
+ address: address2,
1370
+ author,
1371
+ text,
1372
+ replies: [],
1373
+ threadedXml: selfContainedXml(node2)
1374
+ };
1375
+ if (date) comment.date = date;
1376
+ const resolved = boolAttr(node2, "done");
1377
+ if (resolved !== void 0) comment.resolved = resolved;
1378
+ roots.set((att(node2, "id") ?? `${order.length}`).toUpperCase(), comment);
1338
1379
  order.push(comment);
1339
1380
  }
1381
+ for (const comment of order)
1382
+ comment.replies?.sort((a2, b) => {
1383
+ const aDate = a2.date ? Date.parse(a2.date) : NaN;
1384
+ const bDate = b.date ? Date.parse(b.date) : NaN;
1385
+ return Number.isFinite(aDate) && Number.isFinite(bDate) ? aDate - bDate : 0;
1386
+ });
1387
+ if (personsXml) {
1388
+ const records = /* @__PURE__ */ new Map();
1389
+ for (const person of children(parseXml(personsXml).documentElement, "person", NS.tc)) {
1390
+ const id = att(person, "id") ?? "";
1391
+ records.set(id.toUpperCase(), [id, selfContainedXml(person)]);
1392
+ }
1393
+ for (const comment of order) {
1394
+ const ids = /* @__PURE__ */ new Set();
1395
+ for (const message of [comment, ...comment.replies ?? []]) {
1396
+ const node2 = parseXml(message.threadedXml).documentElement;
1397
+ ids.add((att(node2, "personId") ?? "").toUpperCase());
1398
+ const mentions = first(node2, "mentions", NS.tc);
1399
+ if (mentions)
1400
+ for (const mention of children(mentions, "mention", NS.tc))
1401
+ ids.add((att(mention, "mentionpersonId") ?? "").toUpperCase());
1402
+ }
1403
+ const kept = [...ids].flatMap((id) => records.has(id) ? [records.get(id)] : []);
1404
+ if (kept.length) comment.threadedPersons = Object.fromEntries(kept);
1405
+ }
1406
+ }
1340
1407
  return order;
1341
1408
  }
1409
+ function threadedCommentEnvelope(xml) {
1410
+ if (!xml) return void 0;
1411
+ const doc = parseXml(xml);
1412
+ for (const node2 of children(doc.documentElement, "threadedComment", NS.tc)) {
1413
+ doc.documentElement.removeChild(node2);
1414
+ }
1415
+ return buildXml(doc);
1416
+ }
1342
1417
  function mergeComments(legacy, threaded) {
1343
1418
  if (!threaded.length) return legacy;
1344
1419
  const key = (c2) => `${c2.address.row}:${c2.address.col}`;
@@ -1493,7 +1568,7 @@ var init_xml_out = __esm({
1493
1568
  }
1494
1569
  });
1495
1570
 
1496
- // xlsx/write/comments.ts
1571
+ // xlsx/write/comment-ids.ts
1497
1572
  function guidFrom(seed) {
1498
1573
  let h1 = 2166136261;
1499
1574
  let h2 = 16777619;
@@ -1509,6 +1584,440 @@ function guidFrom(seed) {
1509
1584
  const s = hex.join("");
1510
1585
  return `{${s.slice(0, 8)}-${s.slice(8, 12)}-4${s.slice(13, 16)}-8${s.slice(17, 20)}-${s.slice(20, 32)}}`;
1511
1586
  }
1587
+ var validGuid, CommentIds;
1588
+ var init_comment_ids = __esm({
1589
+ "xlsx/write/comment-ids.ts"() {
1590
+ init_xml2();
1591
+ init_address();
1592
+ validGuid = (id) => /^\{[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}\}$/i.test(id);
1593
+ CommentIds = class {
1594
+ reserved = /* @__PURE__ */ new Map();
1595
+ used = /* @__PURE__ */ new Set();
1596
+ mentions = /* @__PURE__ */ new WeakMap();
1597
+ constructor(workbook) {
1598
+ for (const matching2 of [true, false])
1599
+ for (const sheet of workbook?.sheets ?? []) {
1600
+ for (const comment of sheet.comments)
1601
+ for (const message of [comment, ...comment.replies ?? []]) {
1602
+ if (comment.regenerateThreadIds) continue;
1603
+ if (!message.threadedXml) continue;
1604
+ const node2 = parseXml(message.threadedXml).documentElement;
1605
+ if (node2.getAttribute("ref") === formatAddress(comment.address) !== matching2)
1606
+ continue;
1607
+ this.reserve(node2.getAttribute("id") ?? "", message);
1608
+ const mentions = first(node2, "mentions", NS.tc);
1609
+ if (mentions)
1610
+ children(mentions, "mention", NS.tc).forEach((mention, index2) => {
1611
+ this.reserve(
1612
+ mention.getAttribute("mentionId") ?? "",
1613
+ this.mentionOwner(message, index2)
1614
+ );
1615
+ });
1616
+ }
1617
+ }
1618
+ }
1619
+ reserve(id, owner) {
1620
+ const key = id.toUpperCase();
1621
+ if (validGuid(id) && !this.reserved.has(key)) this.reserved.set(key, owner);
1622
+ }
1623
+ mentionOwner(message, index2) {
1624
+ let owners = this.mentions.get(message);
1625
+ if (!owners) this.mentions.set(message, owners = []);
1626
+ return owners[index2] ??= {};
1627
+ }
1628
+ claim(source3, seed, owner, preserve = true) {
1629
+ const key = source3.toUpperCase();
1630
+ if (preserve && validGuid(source3) && !this.used.has(key) && (!this.reserved.has(key) || this.reserved.get(key) === owner)) {
1631
+ this.used.add(key);
1632
+ return source3;
1633
+ }
1634
+ let index2 = 0;
1635
+ let id = guidFrom(seed);
1636
+ while (this.used.has(id) || this.reserved.has(id)) id = guidFrom(`${seed}:${++index2}`);
1637
+ this.used.add(id);
1638
+ return id;
1639
+ }
1640
+ };
1641
+ }
1642
+ });
1643
+
1644
+ // text/text-diff.ts
1645
+ function shortestEdit(n, m, same8, maxEdits) {
1646
+ const max = Math.min(n + m, maxEdits);
1647
+ const offset2 = max + 1;
1648
+ const v = new Int32Array(2 * max + 3);
1649
+ const trace = [];
1650
+ for (let d = 0; d <= max; d++) {
1651
+ for (let k = -d; k <= d; k += 2) {
1652
+ const down = k === -d || k !== d && v[offset2 + k - 1] < v[offset2 + k + 1];
1653
+ let x = down ? v[offset2 + k + 1] : v[offset2 + k - 1] + 1;
1654
+ let y = x - k;
1655
+ while (x < n && y < m && same8(x, y)) {
1656
+ x++;
1657
+ y++;
1658
+ }
1659
+ v[offset2 + k] = x;
1660
+ if (x >= n && y >= m) return backtrack(trace, n, m, d);
1661
+ }
1662
+ trace.push(v.slice(offset2 - d, offset2 + d + 1));
1663
+ }
1664
+ return void 0;
1665
+ }
1666
+ function backtrack(trace, n, m, d) {
1667
+ const edits = [];
1668
+ let x = n;
1669
+ let y = m;
1670
+ for (let step = d; step > 0; step--) {
1671
+ const previous = trace[step - 1];
1672
+ const at = (k2) => previous[k2 + step - 1];
1673
+ const k = x - y;
1674
+ const down = k === -step || k !== step && at(k - 1) < at(k + 1);
1675
+ const before = down ? k + 1 : k - 1;
1676
+ const startX = at(before);
1677
+ const startY = startX - before;
1678
+ edits.push(down ? [startX, startY, true] : [startX, startY, false]);
1679
+ x = startX;
1680
+ y = startY;
1681
+ }
1682
+ return edits.reverse();
1683
+ }
1684
+ function changesOf(edits) {
1685
+ const changes = [];
1686
+ for (const [x, y, inserts] of edits) {
1687
+ const last = changes.at(-1);
1688
+ if (last && last.fromEnd === x && last.toEnd === y) {
1689
+ if (inserts) last.toEnd++;
1690
+ else last.fromEnd++;
1691
+ } else
1692
+ changes.push({
1693
+ fromStart: x,
1694
+ fromEnd: inserts ? x : x + 1,
1695
+ toStart: y,
1696
+ toEnd: inserts ? y + 1 : y
1697
+ });
1698
+ }
1699
+ return changes;
1700
+ }
1701
+ function characterChanges(a2, b, maxEdits) {
1702
+ const edits = shortestEdit(
1703
+ a2.length,
1704
+ b.length,
1705
+ (x, y) => a2.charCodeAt(x) === b.charCodeAt(y),
1706
+ maxEdits
1707
+ );
1708
+ return edits && changesOf(edits);
1709
+ }
1710
+ function tokensOf(text, ids) {
1711
+ const tokens2 = [];
1712
+ const starts = [];
1713
+ for (const match2 of text.matchAll(TOKEN)) {
1714
+ let id = ids.get(match2[0]);
1715
+ if (id === void 0) ids.set(match2[0], id = ids.size);
1716
+ tokens2.push(id);
1717
+ starts.push(match2.index);
1718
+ }
1719
+ starts.push(text.length);
1720
+ return { tokens: tokens2, starts };
1721
+ }
1722
+ function tokenChanges(a2, b, maxEdits) {
1723
+ const ids = /* @__PURE__ */ new Map();
1724
+ const from = tokensOf(a2, ids);
1725
+ const to = tokensOf(b, ids);
1726
+ const edits = shortestEdit(
1727
+ from.tokens.length,
1728
+ to.tokens.length,
1729
+ (x, y) => from.tokens[x] === to.tokens[y],
1730
+ maxEdits
1731
+ );
1732
+ if (!edits) return void 0;
1733
+ let budget = maxEdits;
1734
+ return changesOf(edits).flatMap((stretch) => {
1735
+ const change = {
1736
+ fromStart: from.starts[stretch.fromStart],
1737
+ fromEnd: from.starts[stretch.fromEnd],
1738
+ toStart: to.starts[stretch.toStart],
1739
+ toEnd: to.starts[stretch.toEnd]
1740
+ };
1741
+ const inner = change.fromEnd > change.fromStart && change.toEnd > change.toStart ? characterChanges(
1742
+ a2.slice(change.fromStart, change.fromEnd),
1743
+ b.slice(change.toStart, change.toEnd),
1744
+ budget
1745
+ ) : void 0;
1746
+ if (!inner) return [change];
1747
+ for (const found of inner)
1748
+ budget -= found.fromEnd - found.fromStart + found.toEnd - found.toStart;
1749
+ return inner.map((found) => ({
1750
+ fromStart: found.fromStart + change.fromStart,
1751
+ fromEnd: found.fromEnd + change.fromStart,
1752
+ toStart: found.toStart + change.toStart,
1753
+ toEnd: found.toEnd + change.toStart
1754
+ }));
1755
+ });
1756
+ }
1757
+ function diffText(from, to, maxEdits = 500) {
1758
+ let start = 0;
1759
+ while (start < from.length && start < to.length && from.charCodeAt(start) === to.charCodeAt(start))
1760
+ start++;
1761
+ let end = 0;
1762
+ while (end < from.length - start && end < to.length - start && from.charCodeAt(from.length - 1 - end) === to.charCodeAt(to.length - 1 - end))
1763
+ end++;
1764
+ const a2 = from.slice(start, from.length - end);
1765
+ const b = to.slice(start, to.length - end);
1766
+ if (!a2.length && !b.length) return [];
1767
+ const found = a2.length && b.length ? characterChanges(a2, b, maxEdits) ?? tokenChanges(a2, b, maxEdits) : void 0;
1768
+ const changes = found ?? [{ fromStart: 0, fromEnd: a2.length, toStart: 0, toEnd: b.length }];
1769
+ const result2 = [];
1770
+ for (const change of changes) {
1771
+ const placed = {
1772
+ fromStart: change.fromStart + start,
1773
+ fromEnd: change.fromEnd + start,
1774
+ toStart: change.toStart + start,
1775
+ toEnd: change.toEnd + start
1776
+ };
1777
+ if (placed.fromStart > 0 && placed.toStart > 0 && (isLowSurrogate(from, placed.fromStart) || isLowSurrogate(to, placed.toStart))) {
1778
+ placed.fromStart--;
1779
+ placed.toStart--;
1780
+ }
1781
+ if (isLowSurrogate(from, placed.fromEnd) || isLowSurrogate(to, placed.toEnd)) {
1782
+ placed.fromEnd++;
1783
+ placed.toEnd++;
1784
+ }
1785
+ const last = result2.at(-1);
1786
+ if (last && placed.fromStart <= last.fromEnd) {
1787
+ last.fromEnd = Math.max(last.fromEnd, placed.fromEnd);
1788
+ last.toEnd = Math.max(last.toEnd, placed.toEnd);
1789
+ } else result2.push(placed);
1790
+ }
1791
+ return result2;
1792
+ }
1793
+ var isLowSurrogate, TOKEN;
1794
+ var init_text_diff = __esm({
1795
+ "text/text-diff.ts"() {
1796
+ isLowSurrogate = (text, at) => {
1797
+ const code = text.charCodeAt(at);
1798
+ return code >= 56320 && code <= 57343;
1799
+ };
1800
+ TOKEN = /[\p{L}\p{N}\p{M}]+|\s+|[\s\S]/gu;
1801
+ }
1802
+ });
1803
+
1804
+ // xlsx/write/comment-mentions.ts
1805
+ function patchCommentMentions(node2, before, message, ids, commentId, preserveIds) {
1806
+ const container = first(node2, "mentions", NS.tc);
1807
+ if (!container) return;
1808
+ const changes = diffText(before, message.text);
1809
+ children(container, "mention", NS.tc).forEach((mention, index2) => {
1810
+ const start = Number(mention.getAttribute("startIndex"));
1811
+ const length = Number(mention.getAttribute("length"));
1812
+ const end = start + length;
1813
+ let shift3 = 0;
1814
+ let intact = Number.isInteger(start) && start >= 0 && Number.isInteger(length) && length > 0 && end <= before.length;
1815
+ for (const change of changes) {
1816
+ if (change.fromEnd <= start)
1817
+ shift3 += change.toEnd - change.toStart - (change.fromEnd - change.fromStart);
1818
+ else if (change.fromStart < end) intact = false;
1819
+ }
1820
+ if (!intact) {
1821
+ container.removeChild(mention);
1822
+ return;
1823
+ }
1824
+ mention.setAttribute("startIndex", String(start + shift3));
1825
+ mention.setAttribute(
1826
+ "mentionId",
1827
+ ids.claim(
1828
+ mention.getAttribute("mentionId") ?? "",
1829
+ `${commentId}:mention:${index2}`,
1830
+ ids.mentionOwner(message, index2),
1831
+ preserveIds
1832
+ )
1833
+ );
1834
+ });
1835
+ if (!children(container, "mention", NS.tc).length) node2.removeChild(container);
1836
+ }
1837
+ var init_comment_mentions = __esm({
1838
+ "xlsx/write/comment-mentions.ts"() {
1839
+ init_text_diff();
1840
+ init_xml2();
1841
+ }
1842
+ });
1843
+
1844
+ // xlsx/write/threaded-comments.ts
1845
+ var ThreadedCommentsWriter;
1846
+ var init_threaded_comments = __esm({
1847
+ "xlsx/write/threaded-comments.ts"() {
1848
+ init_xml2();
1849
+ init_comment_ids();
1850
+ init_comment_mentions();
1851
+ init_xml_out();
1852
+ ThreadedCommentsWriter = class {
1853
+ constructor(persons, options = {}) {
1854
+ this.persons = persons;
1855
+ this.doc = parseXml(
1856
+ options.envelope ?? `${XML_HEADER}<ThreadedComments xmlns="${NS.tc}" xmlns:x="${NS.x}"/>`
1857
+ );
1858
+ for (const node2 of children(this.doc.documentElement, "threadedComment", NS.tc))
1859
+ this.doc.documentElement.removeChild(node2);
1860
+ this.ids = options.ids ?? new CommentIds();
1861
+ }
1862
+ persons;
1863
+ doc;
1864
+ ids;
1865
+ count = 0;
1866
+ add(comment, ref, sheetName) {
1867
+ this.persons.retain(comment.threadedPersons);
1868
+ const preserve = !comment.regenerateThreadIds;
1869
+ const prepare2 = (message, seed) => {
1870
+ const source3 = parseXml(message.threadedXml ?? `<threadedComment xmlns="${NS.tc}"/>`);
1871
+ const priorId = source3.documentElement.getAttribute("id") ?? "";
1872
+ const id = this.ids.claim(priorId, seed, message, preserve);
1873
+ return { message, source: source3, priorId, id };
1874
+ };
1875
+ const root = prepare2(comment, `${sheetName}!${ref}:${comment.text}`);
1876
+ const replies = (comment.replies ?? []).map(
1877
+ (reply, index2) => prepare2(reply, `${root.id}:reply:${index2}:${reply.text}`)
1878
+ );
1879
+ const identities = new Map(
1880
+ [root, ...replies].filter((item2) => item2.priorId).map((item2) => [item2.priorId.toUpperCase(), item2.id])
1881
+ );
1882
+ this.message(comment, ref, root.source, root.id, preserve, void 0, comment.resolved);
1883
+ for (const reply of replies)
1884
+ this.message(
1885
+ reply.message,
1886
+ ref,
1887
+ reply.source,
1888
+ reply.id,
1889
+ preserve,
1890
+ identities.get(
1891
+ (reply.source.documentElement.getAttribute("parentId") ?? "").toUpperCase()
1892
+ ) ?? root.id
1893
+ );
1894
+ return root.id;
1895
+ }
1896
+ message(message, ref, source3, id, preserve, parent, resolved) {
1897
+ const node2 = source3.documentElement;
1898
+ const personId = this.persons.id(message.author, node2.getAttribute("personId") ?? void 0);
1899
+ for (const [key, value] of Object.entries({
1900
+ id,
1901
+ ref,
1902
+ personId,
1903
+ dT: message.date,
1904
+ parentId: parent
1905
+ })) {
1906
+ if (value === void 0) node2.removeAttribute(key);
1907
+ else node2.setAttribute(key, value);
1908
+ }
1909
+ if (!parent) {
1910
+ if (resolved === void 0) node2.removeAttribute("done");
1911
+ else node2.setAttribute("done", resolved ? "1" : "0");
1912
+ }
1913
+ let text = first(node2, "text", NS.tc);
1914
+ patchCommentMentions(node2, text?.textContent ?? "", message, this.ids, id, preserve);
1915
+ if (!text) {
1916
+ text = source3.createElementNS(NS.tc, node2.prefix ? `${node2.prefix}:text` : "text");
1917
+ node2.insertBefore(text, node2.firstChild);
1918
+ }
1919
+ text.textContent = message.text;
1920
+ const root = this.doc.documentElement;
1921
+ root.insertBefore(this.doc.importNode(node2, true), first(root, "extLst", NS.tc) ?? null);
1922
+ this.count++;
1923
+ }
1924
+ xml() {
1925
+ return this.count ? buildXml(this.doc) : void 0;
1926
+ }
1927
+ };
1928
+ }
1929
+ });
1930
+
1931
+ // xlsx/write/comment-persons.ts
1932
+ var PersonRegistry;
1933
+ var init_comment_persons = __esm({
1934
+ "xlsx/write/comment-persons.ts"() {
1935
+ init_xml2();
1936
+ init_comment_ids();
1937
+ init_xml_out();
1938
+ PersonRegistry = class {
1939
+ constructor(existing, source3) {
1940
+ this.source = source3;
1941
+ for (const [id, name2] of existing ?? []) {
1942
+ this.names.set(id, name2);
1943
+ this.identities.set(id.toUpperCase(), id);
1944
+ if (!this.byName.has(name2)) this.byName.set(name2, id);
1945
+ }
1946
+ }
1947
+ source;
1948
+ names = /* @__PURE__ */ new Map();
1949
+ byName = /* @__PURE__ */ new Map();
1950
+ identities = /* @__PURE__ */ new Map();
1951
+ added = /* @__PURE__ */ new Map();
1952
+ retained = /* @__PURE__ */ new Map();
1953
+ get changed() {
1954
+ return this.added.size > 0;
1955
+ }
1956
+ /** Bring referenced account records along with a thread copied from another workbook. */
1957
+ retain(records) {
1958
+ for (const [sourceId, xml] of Object.entries(records ?? {})) {
1959
+ const known = this.identities.get(sourceId.toUpperCase());
1960
+ if (known && (this.source || this.retained.has(known))) continue;
1961
+ const node2 = parseXml(xml).documentElement;
1962
+ if (node2.localName !== "person" || node2.namespaceURI !== NS.tc || node2.getAttribute("id")?.toUpperCase() !== sourceId.toUpperCase())
1963
+ continue;
1964
+ const name2 = node2.getAttribute("displayName") ?? "";
1965
+ const id = known ?? node2.getAttribute("id");
1966
+ this.retained.set(id, xml);
1967
+ this.names.set(id, name2);
1968
+ this.identities.set(id.toUpperCase(), id);
1969
+ this.added.set(id, name2);
1970
+ if (!this.byName.has(name2)) this.byName.set(name2, id);
1971
+ }
1972
+ }
1973
+ id(name2, preferred) {
1974
+ const preferredId = preferred ? this.identities.get(preferred.toUpperCase()) : void 0;
1975
+ if (preferredId && this.names.get(preferredId) === name2) return preferredId;
1976
+ let id = this.byName.get(name2);
1977
+ if (!id) {
1978
+ let index2 = 0;
1979
+ id = guidFrom(`person:${name2}`);
1980
+ while (this.identities.has(id.toUpperCase())) id = guidFrom(`person:${name2}:${++index2}`);
1981
+ this.byName.set(name2, id);
1982
+ this.names.set(id, name2);
1983
+ this.identities.set(id.toUpperCase(), id);
1984
+ this.added.set(id, name2);
1985
+ }
1986
+ return id;
1987
+ }
1988
+ xml() {
1989
+ if (this.source && !this.changed) return this.source;
1990
+ const doc = parseXml(
1991
+ this.source ?? `${XML_HEADER}<personList xmlns="${NS.tc}" xmlns:x="${NS.x}"/>`
1992
+ );
1993
+ const root = doc.documentElement;
1994
+ for (const [id, name2] of this.source ? this.added : this.names) {
1995
+ const retained = this.retained.get(id);
1996
+ if (retained) {
1997
+ root.insertBefore(
1998
+ doc.importNode(parseXml(retained).documentElement, true),
1999
+ first(root, "extLst", NS.tc) ?? null
2000
+ );
2001
+ continue;
2002
+ }
2003
+ const person = doc.createElementNS(NS.tc, root.prefix ? `${root.prefix}:person` : "person");
2004
+ for (const [key, value] of Object.entries({
2005
+ id,
2006
+ displayName: name2,
2007
+ userId: name2,
2008
+ providerId: "None"
2009
+ })) {
2010
+ person.setAttribute(key, value);
2011
+ }
2012
+ root.insertBefore(person, first(root, "extLst", NS.tc) ?? null);
2013
+ }
2014
+ return buildXml(doc);
2015
+ }
2016
+ };
2017
+ }
2018
+ });
2019
+
2020
+ // xlsx/write/comments.ts
1512
2021
  function vmlShape(comment, index2, id) {
1513
2022
  const { row: row2, col } = comment.address;
1514
2023
  const anchor = `${col + 1}, 15, ${Math.max(0, row2 - 1)}, 10, ${col + 3}, 15, ${row2 + 3}, 4`;
@@ -1529,7 +2038,7 @@ function vmlXml(comments, layout2) {
1529
2038
  }
1530
2039
  return `<xml xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel"><o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="${data}"/></o:shapelayout>` + NOTE_SHAPETYPE + shapes + "</xml>";
1531
2040
  }
1532
- function commentParts(comments, sheetNumber, persons, sheetName, layout2) {
2041
+ function commentParts(comments, sheetNumber, persons, sheetName, layout2, threadOptions) {
1533
2042
  const authors = [];
1534
2043
  const authorId = (name2) => {
1535
2044
  let id = authors.indexOf(name2);
@@ -1539,18 +2048,11 @@ function commentParts(comments, sheetNumber, persons, sheetName, layout2) {
1539
2048
  const sorted2 = [...comments].sort(
1540
2049
  (a2, b) => a2.address.row - b.address.row || a2.address.col - b.address.col
1541
2050
  );
1542
- let threaded = "";
2051
+ const threads = new ThreadedCommentsWriter(persons, threadOptions);
1543
2052
  const list2 = sorted2.map((comment) => {
1544
2053
  const ref = formatAddress(comment.address);
1545
2054
  if (comment.replies) {
1546
- const id = guidFrom(`${sheetName}!${ref}:${comment.text}`);
1547
- const personId = persons.id(comment.author);
1548
- threaded += `<threadedComment ref="${ref}" personId="${personId}" id="${id}"><text>${escapeText2(comment.text)}</text></threadedComment>`;
1549
- comment.replies.forEach((reply, index2) => {
1550
- const replyId = guidFrom(`${id}:reply:${index2}:${reply.text}`);
1551
- const dT = reply.date ? ` dT="${escapeAttr3(reply.date)}"` : "";
1552
- threaded += `<threadedComment ref="${ref}"${dT} personId="${persons.id(reply.author)}" id="${replyId}" parentId="${id}"><text>${escapeText2(reply.text)}</text></threadedComment>`;
1553
- });
2055
+ const id = threads.add(comment, ref, sheetName);
1554
2056
  const fallback = `${THREADED_NOTE}${comment.text}${comment.replies.map((r) => `
1555
2057
  Reply:
1556
2058
  ${r.text}`).join("")}`;
@@ -1568,42 +2070,19 @@ Reply:
1568
2070
  }
1569
2071
  );
1570
2072
  const parts = { comments: commentsXml, vml };
1571
- if (threaded)
1572
- parts.threaded = `${XML_HEADER}<ThreadedComments xmlns="${NS.tc}" xmlns:x="${NS.x}">${threaded}</ThreadedComments>`;
2073
+ const threaded = threads.xml();
2074
+ if (threaded) parts.threaded = threaded;
1573
2075
  return parts;
1574
2076
  }
1575
- var THREADED_NOTE, PersonRegistry, NOTE_SHAPETYPE;
2077
+ var THREADED_NOTE, NOTE_SHAPETYPE;
1576
2078
  var init_comments2 = __esm({
1577
2079
  "xlsx/write/comments.ts"() {
1578
2080
  init_xml2();
1579
2081
  init_address();
1580
2082
  init_xml_out();
2083
+ init_threaded_comments();
2084
+ init_comment_persons();
1581
2085
  THREADED_NOTE = "[Threaded comment]\n\nYour version of Excel allows you to read this threaded comment; however, any edits to it will get removed if the file is opened in a newer version of Excel. Learn more: https://go.microsoft.com/fwlink/?linkid=870924\n\nComment:\n ";
1582
- PersonRegistry = class {
1583
- names = /* @__PURE__ */ new Map();
1584
- byName = /* @__PURE__ */ new Map();
1585
- constructor(existing) {
1586
- for (const [id, name2] of existing ?? []) {
1587
- this.names.set(id, name2);
1588
- if (!this.byName.has(name2)) this.byName.set(name2, id);
1589
- }
1590
- }
1591
- id(name2) {
1592
- let id = this.byName.get(name2);
1593
- if (!id) {
1594
- id = guidFrom(`person:${name2}`);
1595
- this.byName.set(name2, id);
1596
- this.names.set(id, name2);
1597
- }
1598
- return id;
1599
- }
1600
- xml() {
1601
- const people = [...this.names].map(
1602
- ([id, name2]) => `<person displayName="${escapeAttr3(name2)}" id="${id}" userId="${escapeAttr3(name2)}" providerId="None"/>`
1603
- ).join("");
1604
- return `${XML_HEADER}<personList xmlns="${NS.tc}" xmlns:x="${NS.x}">${people}</personList>`;
1605
- }
1606
- };
1607
2086
  NOTE_SHAPETYPE = '<v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter"/><v:path gradientshapeok="t" o:connecttype="rect"/></v:shapetype>';
1608
2087
  }
1609
2088
  });
@@ -8838,7 +9317,7 @@ function readSheetView(sheetViews) {
8838
9317
  const cols = Math.max(0, Math.round(numAttr(pane, "xSplit") ?? 0));
8839
9318
  if (rows || cols) view.freeze = { rows, cols };
8840
9319
  }
8841
- const split2 = pane && state === "split";
9320
+ const split2 = pane && (state === void 0 || state === "split");
8842
9321
  if (split2) {
8843
9322
  const x = Math.max(0, Math.round(numAttr(pane, "xSplit") ?? 0));
8844
9323
  const y = Math.max(0, Math.round(numAttr(pane, "ySplit") ?? 0));
@@ -8846,9 +9325,8 @@ function readSheetView(sheetViews) {
8846
9325
  view.split = { x, y };
8847
9326
  const first2 = parseAddress(att(node2, "topLeftCell") ?? "");
8848
9327
  if (first2) view.split.topLeft = first2;
8849
- const active = att(pane, "activePane");
8850
- if (active && PANES.has(active))
8851
- view.split.activePane = active;
9328
+ const active = att(pane, "activePane") ?? "topLeft";
9329
+ if (PANES.has(active)) view.split.activePane = active;
8852
9330
  }
8853
9331
  }
8854
9332
  const topLeft = parseAddress(
@@ -9005,6 +9483,146 @@ var init_sheet_props = __esm({
9005
9483
  }
9006
9484
  });
9007
9485
 
9486
+ // xlsx/read/data-validations.ts
9487
+ var VALIDATION_XM;
9488
+ var init_data_validations = __esm({
9489
+ "xlsx/read/data-validations.ts"() {
9490
+ VALIDATION_XM = "http://schemas.microsoft.com/office/excel/2006/main";
9491
+ }
9492
+ });
9493
+
9494
+ // xlsx/write/data-validations.ts
9495
+ function usesValidationExtension(dv) {
9496
+ if (dv.extensionXml) return true;
9497
+ return [dv.formula1, dv.formula2].some((formula2) => {
9498
+ if (!formula2) return false;
9499
+ try {
9500
+ return tokenize(formula2).some((token2) => token2.prefix !== void 0);
9501
+ } catch {
9502
+ return false;
9503
+ }
9504
+ });
9505
+ }
9506
+ function validationAttributes(dv) {
9507
+ return {
9508
+ type: dv.type === "none" ? void 0 : dv.type,
9509
+ errorStyle: dv.errorStyle,
9510
+ operator: dv.operator,
9511
+ allowBlank: dv.allowBlank || void 0,
9512
+ showDropDown: dv.showDropDown === false ? true : void 0,
9513
+ showInputMessage: dv.showInputMessage || void 0,
9514
+ showErrorMessage: dv.showErrorMessage || void 0,
9515
+ errorTitle: dv.errorTitle,
9516
+ error: dv.error,
9517
+ promptTitle: dv.promptTitle,
9518
+ prompt: dv.prompt
9519
+ };
9520
+ }
9521
+ function dataValidationXml(dv, extended) {
9522
+ const sqref2 = dv.ranges.map(formatRange).join(" ");
9523
+ if (!extended) {
9524
+ const formulas = ["formula1", "formula2"].map(
9525
+ (key) => dv[key] === void 0 ? "" : `<${key}>${escapeText2(addFuturePrefixes(dv[key]))}</${key}>`
9526
+ ).join("");
9527
+ const values2 = attrs({ ...validationAttributes(dv), sqref: sqref2 });
9528
+ return formulas ? `<dataValidation${values2}>${formulas}</dataValidation>` : `<dataValidation${values2}/>`;
9529
+ }
9530
+ const doc = parseXml(
9531
+ dv.extensionXml || `<x14:dataValidation xmlns:x14="${NS.x14}" xmlns:xm="${VALIDATION_XM}"/>`
9532
+ );
9533
+ const node2 = doc.documentElement;
9534
+ for (const [key, value] of Object.entries(validationAttributes(dv))) {
9535
+ if (value === void 0) node2.removeAttribute(key);
9536
+ else node2.setAttribute(key, typeof value === "boolean" ? "1" : value);
9537
+ }
9538
+ for (const key of ["formula1", "formula2"]) {
9539
+ let container = first(node2, key, NS.x14);
9540
+ if (dv[key] === void 0) {
9541
+ if (container) node2.removeChild(container);
9542
+ continue;
9543
+ }
9544
+ if (!container) {
9545
+ container = doc.createElementNS(NS.x14, `x14:${key}`);
9546
+ const next = key === "formula1" ? first(node2, "formula2", NS.x14) : void 0;
9547
+ node2.insertBefore(container, next ?? first(node2, "sqref", VALIDATION_XM) ?? null);
9548
+ }
9549
+ let formula2 = first(container, "f", VALIDATION_XM);
9550
+ if (!formula2) {
9551
+ formula2 = doc.createElementNS(VALIDATION_XM, "xm:f");
9552
+ container.appendChild(formula2);
9553
+ }
9554
+ formula2.textContent = addFuturePrefixes(dv[key]);
9555
+ }
9556
+ let ranges = first(node2, "sqref", VALIDATION_XM);
9557
+ if (!ranges) {
9558
+ ranges = doc.createElementNS(VALIDATION_XM, "xm:sqref");
9559
+ node2.appendChild(ranges);
9560
+ }
9561
+ ranges.textContent = sqref2;
9562
+ return buildXml(doc);
9563
+ }
9564
+ function dataValidationsXml(validations) {
9565
+ const items = validations.filter((dv) => dv.ranges.length && !usesValidationExtension(dv)).map((dv) => dataValidationXml(dv, false));
9566
+ return items.length ? `<dataValidations count="${items.length}">${items.join("")}</dataValidations>` : "";
9567
+ }
9568
+ var init_data_validations2 = __esm({
9569
+ "xlsx/write/data-validations.ts"() {
9570
+ init_xml2();
9571
+ init_address();
9572
+ init_tokenizer();
9573
+ init_data_validations();
9574
+ init_formula_text();
9575
+ init_xml_out();
9576
+ }
9577
+ });
9578
+
9579
+ // xlsx/validation-extensions.ts
9580
+ function validationExtensionsXml(sheet, extensions, ids = /* @__PURE__ */ new Set()) {
9581
+ const rules = sheet.dataValidations.filter(
9582
+ (dv) => dv.ranges.length && usesValidationExtension(dv)
9583
+ );
9584
+ const doc = parseXml(extensions || `<extLst xmlns="${NS.x}"/>`);
9585
+ let ext = elements(doc.documentElement).find(
9586
+ (node2) => node2.getAttribute("uri")?.toUpperCase() === URI.toUpperCase()
9587
+ );
9588
+ if (!rules.length) {
9589
+ const collection2 = first(ext, "dataValidations", NS.x14);
9590
+ if (ext && collection2 && !elements(collection2).length) {
9591
+ ext.removeChild(collection2);
9592
+ if (!elements(ext).length) doc.documentElement.removeChild(ext);
9593
+ }
9594
+ return elements(doc.documentElement).length ? inlineFragment(buildXml(doc)) : "";
9595
+ }
9596
+ if (!ext) {
9597
+ ext = doc.createElementNS(NS.x, "ext");
9598
+ ext.setAttribute("uri", URI);
9599
+ doc.documentElement.appendChild(ext);
9600
+ }
9601
+ let collection = first(ext, "dataValidations", NS.x14);
9602
+ if (!collection) {
9603
+ collection = doc.createElementNS(NS.x14, "x14:dataValidations");
9604
+ ext.appendChild(collection);
9605
+ }
9606
+ for (const rule of rules) {
9607
+ const node2 = doc.importNode(parseXml(dataValidationXml(rule, true)).documentElement, true);
9608
+ const id = node2.getAttributeNS(NS.xr, "uid");
9609
+ if (id && ids.has(id)) node2.removeAttributeNS(NS.xr, "uid");
9610
+ else if (id) ids.add(id);
9611
+ collection.appendChild(node2);
9612
+ }
9613
+ collection.setAttribute("count", String(children(collection, "dataValidation", NS.x14).length));
9614
+ return inlineFragment(buildXml(doc));
9615
+ }
9616
+ var URI;
9617
+ var init_validation_extensions = __esm({
9618
+ "xlsx/validation-extensions.ts"() {
9619
+ init_xml2();
9620
+ init_data_validations2();
9621
+ init_xml_out();
9622
+ URI = "{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}";
9623
+ }
9624
+ });
9625
+
9008
9626
  // xlsx/conditional-extensions.ts
9009
9627
  function writeSettings(node2, rule) {
9010
9628
  const bar = first(node2, "dataBar", NS.x14);
@@ -9048,14 +9666,14 @@ function conditionalExtensionsXml(sheet) {
9048
9666
  for (const xml of preserved.slice(1))
9049
9667
  for (const node2 of elements(parseXml(xml).documentElement))
9050
9668
  doc.documentElement.appendChild(doc.importNode(node2, true));
9051
- let ext = elements(doc.documentElement).find((e) => e.getAttribute("uri") === URI);
9669
+ let ext = elements(doc.documentElement).find((e) => e.getAttribute("uri") === URI2);
9052
9670
  let collection = first(ext, "conditionalFormattings", NS.x14);
9053
9671
  for (const format of sheet.conditionalFormats)
9054
9672
  for (const rule of format.rules) {
9055
9673
  if (rule.type !== "dataBar" || !rule.extensionXml || !rule.extensionId) continue;
9056
9674
  if (!ext) {
9057
9675
  ext = doc.createElementNS(NS.x, "ext");
9058
- ext.setAttribute("uri", URI);
9676
+ ext.setAttribute("uri", URI2);
9059
9677
  doc.documentElement.appendChild(ext);
9060
9678
  }
9061
9679
  if (!collection) {
@@ -9075,7 +9693,7 @@ function conditionalExtensionsXml(sheet) {
9075
9693
  }
9076
9694
  return elements(doc.documentElement).length ? inlineFragment(buildXml(doc)) : "";
9077
9695
  }
9078
- var XM, URI;
9696
+ var XM, URI2;
9079
9697
  var init_conditional_extensions = __esm({
9080
9698
  "xlsx/conditional-extensions.ts"() {
9081
9699
  init_xml2();
@@ -9083,7 +9701,7 @@ var init_conditional_extensions = __esm({
9083
9701
  init_xml_util();
9084
9702
  init_xml_out();
9085
9703
  XM = "http://schemas.microsoft.com/office/excel/2006/main";
9086
- URI = "{78C0D931-6437-407d-A8EE-F0AAD7539E65}";
9704
+ URI2 = "{78C0D931-6437-407d-A8EE-F0AAD7539E65}";
9087
9705
  }
9088
9706
  });
9089
9707
 
@@ -44409,6 +45027,92 @@ var init_text_extra = __esm({
44409
45027
  }
44410
45028
  });
44411
45029
 
45030
+ // xlsx/formula/functions/filterxml.ts
45031
+ function preservesSpace(node2) {
45032
+ for (let current = node2; current; current = current.parentNode) {
45033
+ if (current.nodeType !== 1) continue;
45034
+ const value = current.getAttributeNS(XML, "space");
45035
+ if (value) return value === "preserve";
45036
+ }
45037
+ return false;
45038
+ }
45039
+ function prepare(root) {
45040
+ const namespaces = /* @__PURE__ */ Object.create(null);
45041
+ const visit = (element3) => {
45042
+ for (const attr3 of Array.from(element3.attributes)) {
45043
+ if (attr3.namespaceURI !== XMLNS2 || attr3.localName === "xmlns") continue;
45044
+ const prior = namespaces[attr3.localName];
45045
+ if (prior !== void 0 && prior !== attr3.value) throw new Error("Conflicting namespaces");
45046
+ namespaces[attr3.localName] = attr3.value;
45047
+ }
45048
+ for (const child5 of Array.from(element3.childNodes)) {
45049
+ if (child5.nodeType === 1) visit(child5);
45050
+ else if (child5.nodeType === 3 && !child5.nodeValue?.trim() && !preservesSpace(element3))
45051
+ element3.removeChild(child5);
45052
+ }
45053
+ };
45054
+ visit(root);
45055
+ return namespaces;
45056
+ }
45057
+ function nodeValue(node2) {
45058
+ let text;
45059
+ if (node2.nodeType === 2) text = (node2.nodeValue ?? "").trim();
45060
+ else if (node2.nodeType === 1) {
45061
+ const preserve = preservesSpace(node2);
45062
+ text = Array.from(node2.childNodes).filter((child5) => child5.nodeType === 3 || child5.nodeType === 4).map((child5) => {
45063
+ const value = child5.nodeValue ?? "";
45064
+ return preserve || child5.nodeType === 4 ? value : value.trim();
45065
+ }).join("");
45066
+ } else return ERR.VALUE;
45067
+ if (!text) return ERR.VALUE;
45068
+ if (/^(true|false)$/i.test(text)) return text.toLowerCase() === "true";
45069
+ const date = /^(\d{1,4})[-/](\d{1,2})[-/](\d{1,4})(.*)$/.exec(text.trim());
45070
+ let numberText = text;
45071
+ if (date) {
45072
+ let year = Number(date[1]);
45073
+ if (year < 100) year += year < 30 ? 2e3 : 1900;
45074
+ numberText = `${year}-${date[2]}-${date[3]}${date[4]?.replace(/^T/, " ") ?? ""}`;
45075
+ }
45076
+ return parseNumberText(numberText) ?? text;
45077
+ }
45078
+ var XML, XMLNS2, FILTERXML;
45079
+ var init_filterxml = __esm({
45080
+ "xlsx/formula/functions/filterxml.ts"() {
45081
+ init_xml2();
45082
+ init_text_number();
45083
+ init_values();
45084
+ init_helpers();
45085
+ XML = "http://www.w3.org/XML/1998/namespace";
45086
+ XMLNS2 = "http://www.w3.org/2000/xmlns/";
45087
+ FILTERXML = spec(
45088
+ "FILTERXML",
45089
+ "Web",
45090
+ "FILTERXML(xml, xpath)",
45091
+ "Returns XML element or attribute values selected by XPath, as a column.",
45092
+ 2,
45093
+ 2,
45094
+ (args) => {
45095
+ const xml = str(args[0]);
45096
+ const expression = str(args[1]);
45097
+ if (xml.length > 32767 || expression.length > 32767) return ERR.VALUE;
45098
+ let nodes;
45099
+ try {
45100
+ const doc = parseXml(xml, { warningsAsErrors: true, label: "FILTERXML" });
45101
+ nodes = selectXmlNodes(expression, doc, {
45102
+ namespaces: prepare(doc.documentElement),
45103
+ matchDefaultNamespace: true
45104
+ });
45105
+ } catch {
45106
+ return ERR.VALUE;
45107
+ }
45108
+ if (!nodes.length) return ERR.VALUE;
45109
+ chargeArrayCells(nodes.length);
45110
+ return new Matrix(nodes.map((node2) => [nodeValue(node2)]));
45111
+ }
45112
+ );
45113
+ }
45114
+ });
45115
+
44412
45116
  // xlsx/formula/functions/registry.ts
44413
45117
  var ALL, REGISTRY, getFunction;
44414
45118
  var init_registry2 = __esm({
@@ -44431,6 +45135,7 @@ var init_registry2 = __esm({
44431
45135
  init_groupby();
44432
45136
  init_modern();
44433
45137
  init_text_extra();
45138
+ init_filterxml();
44434
45139
  ALL = [
44435
45140
  ...MATH_FUNCTIONS,
44436
45141
  ...MATRIX_FUNCTIONS,
@@ -44439,6 +45144,7 @@ var init_registry2 = __esm({
44439
45144
  ...LOGICAL_FUNCTIONS,
44440
45145
  ...TEXT_FUNCTIONS,
44441
45146
  ...TEXT_EXTRA_FUNCTIONS,
45147
+ FILTERXML,
44442
45148
  BAHTTEXT,
44443
45149
  GETPIVOTDATA,
44444
45150
  ...GROUPBY_FUNCTIONS,
@@ -45776,6 +46482,16 @@ var init_page_setup = __esm({
45776
46482
  }
45777
46483
  });
45778
46484
 
46485
+ // xlsx/layout/split.ts
46486
+ function splitActivePane(split2) {
46487
+ const valid2 = split2.x > 0 && split2.y > 0 ? ["topLeft", "topRight", "bottomLeft", "bottomRight"] : split2.y > 0 ? ["topLeft", "bottomLeft"] : ["topLeft", "topRight"];
46488
+ return split2.activePane && valid2.includes(split2.activePane) ? split2.activePane : valid2[valid2.length - 1];
46489
+ }
46490
+ var init_split = __esm({
46491
+ "xlsx/layout/split.ts"() {
46492
+ }
46493
+ });
46494
+
45779
46495
  // xlsx/write/filter-columns.ts
45780
46496
  function criteriaOf(column2) {
45781
46497
  const { values: values2, blank, dateGroups, custom, top10, dynamic, color, icon, hiddenButton } = column2;
@@ -45954,16 +46670,14 @@ function dimensionXml(sheet) {
45954
46670
  const used = usedRange(sheet);
45955
46671
  return `<dimension ref="${used ? formatRange(used) : "A1"}"/>`;
45956
46672
  }
45957
- function splitActivePane(split2) {
45958
- const both = split2.x > 0 && split2.y > 0;
45959
- const valid2 = both ? ["topLeft", "topRight", "bottomLeft", "bottomRight"] : split2.y > 0 ? ["topLeft", "bottomLeft"] : ["topLeft", "topRight"];
45960
- if (split2.activePane && valid2.includes(split2.activePane)) return split2.activePane;
45961
- return both ? "bottomRight" : split2.y > 0 ? "bottomLeft" : "topRight";
45962
- }
45963
46673
  function selectionXml(selection, pane) {
46674
+ const activeCellId = selection.ranges.findIndex(
46675
+ (range) => rangeContains(range, selection.active)
46676
+ );
45964
46677
  return el("selection", {
45965
46678
  pane,
45966
46679
  activeCell: formatAddress(selection.active),
46680
+ activeCellId: activeCellId > 0 ? activeCellId : void 0,
45967
46681
  sqref: sqref(selection.ranges) || formatAddress(selection.active)
45968
46682
  });
45969
46683
  }
@@ -46117,6 +46831,7 @@ var init_sheet_props2 = __esm({
46117
46831
  init_xml2();
46118
46832
  init_address();
46119
46833
  init_cells();
46834
+ init_split();
46120
46835
  init_sheet_props();
46121
46836
  init_xml_util();
46122
46837
  init_filter_columns2();
@@ -46602,28 +47317,6 @@ function conditionalFormatsXml(formats, styles) {
46602
47317
  return `<conditionalFormatting sqref="${format.ranges.map((r) => formatRange(r)).join(" ")}">${rules}</conditionalFormatting>`;
46603
47318
  }).join("");
46604
47319
  }
46605
- function dataValidationsXml(validations) {
46606
- const items = validations.filter((dv) => dv.ranges.length).map((dv) => {
46607
- const hideDropDown = dv.showDropDown === false ? true : void 0;
46608
- const values2 = attrs({
46609
- type: dv.type === "none" ? void 0 : dv.type,
46610
- errorStyle: dv.errorStyle,
46611
- operator: dv.operator,
46612
- allowBlank: dv.allowBlank || void 0,
46613
- showDropDown: hideDropDown,
46614
- showInputMessage: dv.showInputMessage || void 0,
46615
- showErrorMessage: dv.showErrorMessage || void 0,
46616
- errorTitle: dv.errorTitle,
46617
- error: dv.error,
46618
- promptTitle: dv.promptTitle,
46619
- prompt: dv.prompt,
46620
- sqref: dv.ranges.map((r) => formatRange(r)).join(" ")
46621
- });
46622
- const formulas = (dv.formula1 !== void 0 ? formulaXml2(dv.formula1, "formula1") : "") + (dv.formula2 !== void 0 ? formulaXml2(dv.formula2, "formula2") : "");
46623
- return formulas ? `<dataValidation${values2}>${formulas}</dataValidation>` : `<dataValidation${values2}/>`;
46624
- });
46625
- return items.length ? `<dataValidations count="${items.length}">${items.join("")}</dataValidations>` : "";
46626
- }
46627
47320
  var cfvoXml, formulaXml2, quote, TEXT_OPERATORS;
46628
47321
  var init_conditional = __esm({
46629
47322
  "xlsx/write/conditional.ts"() {
@@ -47596,6 +48289,8 @@ function writeComments(ctx, sheet, index2, partName, rels) {
47596
48289
  const { writer, source: source3 } = ctx;
47597
48290
  const name2 = (pattern) => writer.uniqueName(pattern, ctx.reserved);
47598
48291
  const fromSource = source3 && sheet.partName && source3.has(sheet.partName);
48292
+ const sourceThreaded = fromSource ? source3.targetOfType(sheet.partName ?? "", RELATIONSHIP_TYPES.threadedComment) : void 0;
48293
+ const threadEnvelope = sheet.threadedCommentsXml ?? threadedCommentEnvelope(sourceThreaded ? source3?.text(sourceThreaded) : void 0);
47599
48294
  const sourceVml = fromSource ? sourceVmlPart(source3, sheet.partName ?? "") : void 0;
47600
48295
  const kept = source3 && sourceVml && !writer.has(sourceVml) ? stripNoteShapes(source3.text(sourceVml) ?? "") : void 0;
47601
48296
  const base = kept && kept.kept > 0 ? kept.xml : void 0;
@@ -47620,11 +48315,13 @@ function writeComments(ctx, sheet, index2, partName, rels) {
47620
48315
  parseLegacyComments(legacyPart ? source3.text(legacyPart) : void 0),
47621
48316
  parseThreadedComments(
47622
48317
  threadedPart ? source3.text(threadedPart) : void 0,
47623
- parsePersons(personsPart ? source3.text(personsPart) : void 0)
48318
+ parsePersons(personsPart ? source3.text(personsPart) : void 0),
48319
+ personsPart ? source3.text(personsPart) : void 0
47624
48320
  )
47625
48321
  );
47626
48322
  const free = [legacyPart, threadedPart, vmlPart].every((p) => !p || !writer.has(p));
47627
- if (legacyPart && vmlPart && free && sameModel(before, sheet.comments)) {
48323
+ const envelope = threadedCommentEnvelope(threadedPart ? source3.text(threadedPart) : void 0);
48324
+ if (legacyPart && vmlPart && free && sameModel(before, sheet.comments) && (sheet.threadedCommentsXml === void 0 || sheet.threadedCommentsXml === envelope)) {
47628
48325
  writer.carry(legacyPart);
47629
48326
  writer.carry(vmlPart);
47630
48327
  rels.add(RELATIONSHIP_TYPES.comments, relativeTarget(partName, legacyPart));
@@ -47638,10 +48335,20 @@ function writeComments(ctx, sheet, index2, partName, rels) {
47638
48335
  }
47639
48336
  const own = base ? vmlIdmapBlocks(base) : [];
47640
48337
  const layout2 = vmlAllocatorFor(ctx, source3).allocate(sheet.comments.length, index2 + 1, own);
47641
- const parts = commentParts(sheet.comments, index2 + 1, ctx.persons, sheet.name, {
47642
- ...layout2,
47643
- ...base ? { base } : {}
47644
- });
48338
+ const parts = commentParts(
48339
+ sheet.comments,
48340
+ index2 + 1,
48341
+ ctx.persons,
48342
+ sheet.name,
48343
+ {
48344
+ ...layout2,
48345
+ ...base ? { base } : {}
48346
+ },
48347
+ {
48348
+ ...threadEnvelope ? { envelope: threadEnvelope } : {},
48349
+ ids: ctx.commentIds ??= new CommentIds(ctx.workbook)
48350
+ }
48351
+ );
47645
48352
  const commentsPart = name2((n) => `xl/comments${n}.xml`);
47646
48353
  writer.add(commentsPart, parts.comments, CONTENT_TYPES.comments);
47647
48354
  rels.add(RELATIONSHIP_TYPES.comments, relativeTarget(partName, commentsPart));
@@ -47720,6 +48427,7 @@ var init_sheet_parts = __esm({
47720
48427
  init_tables();
47721
48428
  init_chart_cache();
47722
48429
  init_comments2();
48430
+ init_comment_ids();
47723
48431
  init_drawing4();
47724
48432
  init_snapshot();
47725
48433
  init_vml_ids();
@@ -47850,13 +48558,17 @@ function writeWorksheet(ctx, sheet, index2, partName) {
47850
48558
  blocks.set("legacyDrawing", writeComments(ctx, sheet, index2, partName, rels));
47851
48559
  blocks.set("tableParts", tableParts);
47852
48560
  ctx.pivots?.writeSheet(writer, sheet, partName, rels);
47853
- const extensions = conditionalExtensionsXml(sheet);
48561
+ const extensions = validationExtensionsXml(
48562
+ sheet,
48563
+ conditionalExtensionsXml(sheet),
48564
+ ctx.validationIds ??= /* @__PURE__ */ new Set()
48565
+ );
47854
48566
  blocks.set(
47855
48567
  "extLst",
47856
48568
  ctx.slicers?.active ? ctx.slicers.writeSheet(sheet, partName, rels, extensions) : extensions
47857
48569
  );
47858
48570
  for (const [key, list2] of sheet.preserved) {
47859
- if (key.startsWith("source:") || !WORKSHEET_CHILD_ORDER.includes(key) || (blocks.get(key) ?? "") !== "" || key === "extLst" && ctx.slicers?.active)
48571
+ if (key.startsWith("source:") || !WORKSHEET_CHILD_ORDER.includes(key) || (blocks.get(key) ?? "") !== "" || key === "extLst")
47860
48572
  continue;
47861
48573
  const valid2 = list2.filter(
47862
48574
  (xml) => [...xml.matchAll(/\br:(?:id|embed|link|pict)="([^"]*)"/g)].every(
@@ -47880,6 +48592,8 @@ var init_worksheet2 = __esm({
47880
48592
  init_package2();
47881
48593
  init_print_options();
47882
48594
  init_conditional();
48595
+ init_data_validations2();
48596
+ init_validation_extensions();
47883
48597
  init_conditional_extensions();
47884
48598
  init_package_writer();
47885
48599
  init_page_setup();
@@ -48821,7 +49535,8 @@ async function saveXlsx(workbook) {
48821
49535
  styles: new StyleWriter(workbook, stylesPart ? source3?.text(stylesPart) : void 0),
48822
49536
  strings: new SharedStringTable(),
48823
49537
  persons: new PersonRegistry(
48824
- parsePersons(personsSource ? source3?.text(personsSource) : void 0)
49538
+ parsePersons(personsSource ? source3?.text(personsSource) : void 0),
49539
+ personsSource ? source3?.text(personsSource) : void 0
48825
49540
  ),
48826
49541
  reserved,
48827
49542
  tableIds: /* @__PURE__ */ new Set(),
@@ -48896,7 +49611,9 @@ async function saveXlsx(workbook) {
48896
49611
  rels.add(RELATIONSHIP_TYPES.theme, relativeTarget(bookPart, outTheme));
48897
49612
  if (ctx.threaded.used) {
48898
49613
  const personsPart = personsSource ?? "xl/persons/person.xml";
48899
- writer.add(personsPart, ctx.persons.xml(), CONTENT_TYPES.persons);
49614
+ if (personsSource) writer.carry(personsSource);
49615
+ if (!personsSource || ctx.persons.changed)
49616
+ writer.add(personsPart, ctx.persons.xml(), CONTENT_TYPES.persons);
48900
49617
  rels.add(RELATIONSHIP_TYPES.person, relativeTarget(bookPart, personsPart));
48901
49618
  }
48902
49619
  writeMetadataPart(