@docx4j/core-ts 0.2.2 → 0.3.0

package/dist/parts/wml/comments.mjs

@@ -3,8 +3,10 @@ import * as w15Factory from '@docx4j/generated-objects-ts/factory/org_docx4j_w15
 import * as w16cidFactory from '@docx4j/generated-objects-ts/factory/org_docx4j_w16cid';
 import { linkParents } from '@docx4j/generated-objects-ts/builders/wml';
 import { Docx4JException } from '../../opc/exceptions.mjs';
+import { parseXml } from '../../xml/dom.mjs';
 import { MainDocumentPart, CommentsPart, CommentsExtendedPart, CommentsIdsPart, PeoplePart } from './index.mjs';
 import { COMMENT_REFERENCE_STYLE, COMMENT_TEXT_STYLE, setCommentPartsAccess, dateToCalendar, } from '../../model/content/comments.mjs';
+import { dateOf } from '../../model/content/tracking.mjs';
 // Loaded for its side effect: the Comment views register themselves with the content API.
 import '../../model/content/Comment.mjs';
 /** The comment parts of one document. */
@@ -14,6 +16,7 @@ class DocumentCommentParts {
         this.commentsPart = commentsPart;
         this.comments = comments;
         this.author = author;
+        this.datesUtc = new Map();
         this.loadedAll = false;
     }
     ensureCommentsEx() {
@@ -66,8 +69,52 @@ async function partsFor(main, commentsPart, author) {
         parts.commentsEx = await main.commentsExtendedPart.getContents();
     if (main.peoplePart)
         parts.people = await main.peoplePart.getContents();
+    await readDatesUtc(main, parts.datesUtc);
     return parts;
 }
+const W16CID_NS = 'http://schemas.microsoft.com/office/word/2016/wordml/cid';
+const W16CEX_NS = 'http://schemas.microsoft.com/office/word/2018/wordml/cex';
+/**
+ * Each comment's `w16cex:dateUtc`, by the paragraph id `w16cid:commentId` pairs its durable id with.
+ * From the parts' contents when they are unmarshalled, else from their XML, which leaves them
+ * untouched: no view needs them otherwise, and an unmarshalled part is re-marshalled on save.
+ */
+async function readDatesUtc(main, into) {
+    var _a, _b, _c;
+    const idsPart = main.commentsIdsPart;
+    const extensiblePart = main.commentsExtensiblePart;
+    if (!idsPart || !extensiblePart)
+        return;
+    const paraIdOf = new Map();
+    if (idsPart.isUnmarshalled) {
+        for (const e of (_a = idsPart.contents.commentId) !== null && _a !== void 0 ? _a : [])
+            if (e.durableId && e.paraId)
+                paraIdOf.set(e.durableId.toUpperCase(), e.paraId.toUpperCase());
+    }
+    else {
+        for (const e of Array.from(parseXml(await idsPart.getXml()).getElementsByTagNameNS(W16CID_NS, 'commentId'))) {
+            const durableId = e.getAttributeNS(W16CID_NS, 'durableId');
+            const paraId = e.getAttributeNS(W16CID_NS, 'paraId');
+            if (durableId && paraId)
+                paraIdOf.set(durableId.toUpperCase(), paraId.toUpperCase());
+        }
+    }
+    const add = (durableId, date) => {
+        const paraId = durableId ? paraIdOf.get(durableId.toUpperCase()) : undefined;
+        if (paraId && date && !Number.isNaN(date.getTime()))
+            into.set(paraId, date);
+    };
+    if (extensiblePart.isUnmarshalled) {
+        for (const e of (_b = extensiblePart.contents.commentExtensible) !== null && _b !== void 0 ? _b : [])
+            add(e.durableId, dateOf(e.dateUtc));
+    }
+    else {
+        for (const e of Array.from(parseXml(await extensiblePart.getXml()).getElementsByTagNameNS(W16CEX_NS, 'commentExtensible'))) {
+            const value = e.getAttributeNS(W16CEX_NS, 'dateUtc');
+            add((_c = e.getAttributeNS(W16CEX_NS, 'durableId')) !== null && _c !== void 0 ? _c : undefined, value ? new Date(value) : undefined);
+        }
+    }
+}
 async function ensurePeople(main) {
     if (main.peoplePart)
         return main.peoplePart.getContents();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docx4j/core-ts",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "docx4j-core for TypeScript: Open Packaging (docx/pptx/xlsx zip and flat OPC), typed parts and relationships, style, numbering and font resolution over @docx4j/generated-objects-ts. Node, browsers, Word add-ins.",
   "type": "module",
   "main": "./dist/index.mjs",