oasis-editor 0.0.180 → 0.0.182

package/dist/core/model/types/documentComments.d.ts

@@ -41,6 +41,8 @@ export interface EditorComment {
     dateUtc?: number;
     /** Resolved/"done" state (`w15:commentEx/@w15:done`). */
     resolved?: boolean;
+    /** Editor-local parent comment id for a threaded reply (`w15:paraIdParent`). */
+    parentId?: string;
     /** Flattened comment body text (bodies in scope are single paragraphs). */
     text: string;
     /** Start anchor. May be absent for a malformed import (orphan end). */

package/dist/core/model/types/nodes.d.ts

@@ -353,7 +353,9 @@ export interface EditorTableRowNode {
      * resolution and re-serialized before `w:trPr` on export.
      */
     propertyExceptions?: EditorTableStyle;
-    /** Raw `<w:tblPrExChange ...>` XML preserved for DOCX round-trip. */
+    /** Semantic previous row table-property exceptions from `w:tblPrExChange`. */
+    propertyExceptionsRevision?: EditorPropertyRevision<EditorTableStyle>;
+    /** Exact imported `<w:tblPrExChange ...>` retained as a preservation fallback. */
     tblPrExChangeXml?: string;
     /** Extension attributes (e.g. `w14:paraId`, `w15:*`) preserved for round-trip. */
     extAttributes?: Record<string, string>;

package/dist/import/docx/commentsXml.d.ts

@@ -8,6 +8,8 @@ export interface ParsedCommentBody {
     resolved?: boolean;
     /** `w14:paraId` of the comment's (first) paragraph — links to commentsEx. */
     paraId?: string;
+    /** Parent comment paragraph id from `w15:commentEx/@w15:paraIdParent`. */
+    parentParaId?: string;
 }
 /**
  * Parse `word/comments.xml` (+ optional `word/commentsExtended.xml`) into a map

package/dist/import/docx/tableProperties.d.ts

@@ -1,9 +1,10 @@
 import { Element as XmlElement } from '@xmldom/xmldom';
-import { EditorTableCellStyle, EditorTableRowNode, EditorTableRowStyle, EditorTableStyle, EditorTableConditionalFlags } from '../../core/model.js';
+import { EditorTableCellStyle, EditorTableRowNode, EditorTableRowStyle, EditorTableStyle, EditorPropertyRevision, EditorTableConditionalFlags } from '../../core/model.js';
 import { EditorTableBorders } from './borders.js';
 import { ThemeColorMap } from './themeColors.js';
 
 export declare function parseTableConditionalFlags(properties: XmlElement | null): EditorTableConditionalFlags | undefined;
+export declare function parseTablePropertyExceptionRevision(change: XmlElement | null): EditorPropertyRevision<EditorTableStyle> | undefined;
 export declare function parseTableStyle(tblPr: XmlElement | null, tableStyleId?: string): EditorTableStyle | undefined;
 export declare function parseTableRowStyle(rowProperties: XmlElement | null): EditorTableRowStyle | undefined;
 export declare function getTableCellColSpan(cellProperties: XmlElement | null): number;

package/dist/{index-C0KjmCqU.js → index-BbOqOr2T.js}

@@ -2863,7 +2863,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-h2nQFM-y.js").then((m) => {
+    import("./OasisEditorApp-BAPDCzny.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -37552,6 +37552,16 @@ function parseRevisionMetadata(element) {
     date: Number.isFinite(parsedDate) ? parsedDate : 0
   };
 }
+function parseTablePropertyExceptionRevision(change) {
+  if (!change) return void 0;
+  const previous = getFirstChildByTagNameNS(change, WORD_NS$3, "tblPrEx");
+  if (!previous) return void 0;
+  return {
+    ...parseRevisionMetadata(change),
+    type: "property",
+    previous: parseTableStyle(previous) ?? {}
+  };
+}
 function parseFloatingTableProperties(tblPr) {
   const tblpPr = getFirstChildByTagNameNS(tblPr, WORD_NS$3, "tblpPr");
   if (!tblpPr || !tblpPr.attributes || tblpPr.attributes.length === 0) {
@@ -41174,6 +41184,10 @@ async function parseTableNode(tableNode, numberingMaps, zip, relsMap, assets, th
         "tblPrExChange"
       );
       if (changeEl) {
+        const revision = parseTablePropertyExceptionRevision(changeEl);
+        if (revision) {
+          row.propertyExceptionsRevision = revision;
+        }
         row.tblPrExChangeXml = new XMLSerializer().serializeToString(changeEl);
       }
     }
@@ -41741,14 +41755,14 @@ function parseDate(value2) {
   return Number.isNaN(ms) ? void 0 : ms;
 }
 function parseCommentsExtended(xml) {
-  const done = /* @__PURE__ */ new Map();
+  const extended = /* @__PURE__ */ new Map();
   if (!xml) {
-    return done;
+    return extended;
   }
   const doc = new DOMParser$1().parseFromString(xml, "application/xml");
   const root = doc.documentElement;
   if (!root) {
-    return done;
+    return extended;
   }
   for (const ex of getChildrenByTagNameNS(root, WORD15_NS$2, "commentEx")) {
     const paraId = ex.getAttributeNS(WORD15_NS$2, "paraId");
@@ -41756,9 +41770,13 @@ function parseCommentsExtended(xml) {
       continue;
     }
     const isDone = ex.getAttributeNS(WORD15_NS$2, "done");
-    done.set(paraId, isDone === "1" || isDone === "true");
+    const parentParaId = ex.getAttributeNS(WORD15_NS$2, "paraIdParent") || void 0;
+    extended.set(paraId, {
+      resolved: isDone === "1" || isDone === "true",
+      ...parentParaId ? { parentParaId } : {}
+    });
   }
-  return done;
+  return extended;
 }
 function parseCommentsXml(commentsXml, commentsExtendedXml) {
   const byDocxId = /* @__PURE__ */ new Map();
@@ -41770,7 +41788,7 @@ function parseCommentsXml(commentsXml, commentsExtendedXml) {
   if (!root) {
     return byDocxId;
   }
-  const doneByParaId = parseCommentsExtended(commentsExtendedXml);
+  const extendedByParaId = parseCommentsExtended(commentsExtendedXml);
   for (const comment of getChildrenByTagNameNS(root, WORD_NS$3, "comment")) {
     const docxId = getAttributeValue(comment, "id");
     if (docxId === null) {
@@ -41783,15 +41801,16 @@ function parseCommentsXml(commentsXml, commentsExtendedXml) {
     const paragraphs = getChildrenByTagNameNS(comment, WORD_NS$3, "p");
     const text2 = paragraphs.map((p) => flattenCommentText(p)).join("\n").trim();
     const paraId = paragraphs.length > 0 ? getAttributeValue(paragraphs[0], "paraId") ?? void 0 : void 0;
-    const resolved = paraId !== void 0 ? doneByParaId.get(paraId) : void 0;
+    const extended = paraId !== void 0 ? extendedByParaId.get(paraId) : void 0;
     byDocxId.set(docxId, {
       author,
       ...initials ? { initials } : {},
       ...date !== void 0 ? { date } : {},
       ...dateUtc !== void 0 ? { dateUtc } : {},
       text: text2,
-      ...resolved ? { resolved } : {},
-      ...paraId ? { paraId } : {}
+      ...(extended == null ? void 0 : extended.resolved) ? { resolved: true } : {},
+      ...paraId ? { paraId } : {},
+      ...(extended == null ? void 0 : extended.parentParaId) ? { parentParaId: extended.parentParaId } : {}
     });
   }
   return byDocxId;
@@ -42264,6 +42283,17 @@ function buildEditorComments(ranges, bodies) {
     }
     return na - nb;
   });
+  const localIdByDocxId = /* @__PURE__ */ new Map();
+  for (const docxId of sorted) {
+    localIdByDocxId.set(docxId, createEditorCommentId());
+  }
+  const localIdByParaId = /* @__PURE__ */ new Map();
+  for (const [docxId, body] of bodies) {
+    const localId = localIdByDocxId.get(docxId);
+    if (localId && body.paraId) {
+      localIdByParaId.set(body.paraId, localId);
+    }
+  }
   const items = {};
   const order = [];
   for (const docxId of sorted) {
@@ -42272,7 +42302,8 @@ function buildEditorComments(ranges, bodies) {
     if (!range && !body) {
       continue;
     }
-    const id = createEditorCommentId();
+    const id = localIdByDocxId.get(docxId);
+    const parentId = (body == null ? void 0 : body.parentParaId) ? localIdByParaId.get(body.parentParaId) : void 0;
     const docxIdNum = Number.parseInt(docxId, 10);
     items[id] = {
       id,
@@ -42281,6 +42312,7 @@ function buildEditorComments(ranges, bodies) {
       ...(body == null ? void 0 : body.date) !== void 0 ? { date: body.date } : {},
       ...(body == null ? void 0 : body.dateUtc) !== void 0 ? { dateUtc: body.dateUtc } : {},
       ...(body == null ? void 0 : body.resolved) ? { resolved: body.resolved } : {},
+      ...parentId ? { parentId } : {},
       text: (body == null ? void 0 : body.text) ?? "",
       ...(range == null ? void 0 : range.start) ? { start: range.start } : {},
       ...(range == null ? void 0 : range.end) ? { end: range.end } : {},
@@ -42721,9 +42753,14 @@ function buildCommentsPartXml(plan) {
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:comments ${COMMENTS_XMLNS}>${body}</w:comments>`;
 }
 function buildCommentsExtendedPartXml(plan) {
-  const body = plan.comments.map(
-    ({ comment, paraId }) => `<w15:commentEx w15:paraId="${paraId}" w15:done="${comment.resolved ? "1" : "0"}"/>`
-  ).join("");
+  const paraIdByCommentId = new Map(
+    plan.comments.map(({ comment, paraId }) => [comment.id, paraId])
+  );
+  const body = plan.comments.map(({ comment, paraId }) => {
+    const parentParaId = comment.parentId ? paraIdByCommentId.get(comment.parentId) : void 0;
+    const parentAttr = parentParaId ? ` w15:paraIdParent="${parentParaId}"` : "";
+    return `<w15:commentEx w15:paraId="${paraId}"${parentAttr} w15:done="${comment.resolved ? "1" : "0"}"/>`;
+  }).join("");
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w15:commentsEx ${COMMENTS_XMLNS}>${body}</w15:commentsEx>`;
 }
 function isUsableNoteDocxId(value2) {
@@ -43179,8 +43216,8 @@ function serializeTableProperties(table) {
   }
   return `<w:tblPr>${parts.join("")}</w:tblPr>`;
 }
-function serializeTablePropertyExceptions(exceptions, tblPrExChangeXml) {
-  if (!exceptions && !tblPrExChangeXml) {
+function serializeTablePropertyExceptions(exceptions, revision, tblPrExChangeXml) {
+  if (!exceptions && !revision && !tblPrExChangeXml) {
     return "";
   }
   const parts = [];
@@ -43216,6 +43253,11 @@ function serializeTablePropertyExceptions(exceptions, tblPrExChangeXml) {
   }
   if (tblPrExChangeXml) {
     parts.push(tblPrExChangeXml);
+  } else if (revision) {
+    const previous = serializeTablePropertyExceptions(revision.previous) || "<w:tblPrEx/>";
+    parts.push(
+      `<w:tblPrExChange ${serializeRevisionAttrs(revision)}>${previous}</w:tblPrExChange>`
+    );
   }
   return parts.length > 0 ? `<w:tblPrEx>${parts.join("")}</w:tblPrEx>` : "";
 }
@@ -43244,7 +43286,11 @@ function serializeTableXml(table, serializeBlockXml) {
       const contentXml = cell.vMerge === "continue" ? "<w:p/>" : blocksXml;
       return `<w:tc${serializeExtAttributes(cell.extAttributes)}>${serializeTableCellProperties(cell, fallbackWidthPt)}${contentXml}</w:tc>`;
     }).join("");
-    return `<w:tr${serializeExtAttributes(row.extAttributes)}>${serializeTablePropertyExceptions(row.propertyExceptions, row.tblPrExChangeXml)}${serializeTableRowProperties(row)}${cellsXml}</w:tr>`;
+    return `<w:tr${serializeExtAttributes(row.extAttributes)}>${serializeTablePropertyExceptions(
+      row.propertyExceptions,
+      row.propertyExceptionsRevision,
+      row.tblPrExChangeXml
+    )}${serializeTableRowProperties(row)}${cellsXml}</w:tr>`;
   }).join("");
   const gridXml = table.gridCols ? `<w:tblGrid>${table.gridCols.map(
     (width) => `<w:gridCol w:w="${pointsToTwips(width) ?? 0}"/>`
@@ -48014,7 +48060,7 @@ async function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-CTxcTGME.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-D5fxy-0f.js", import.meta.url).href,
         import.meta.url
       ),
       {
@@ -51955,6 +52001,8 @@ function cloneBlock(block) {
         rows: block.rows.map((row) => ({
           ...row,
           conditionalStyle: row.conditionalStyle ? { ...row.conditionalStyle } : void 0,
+          propertyExceptions: row.propertyExceptions ? structuredClone(row.propertyExceptions) : void 0,
+          propertyExceptionsRevision: row.propertyExceptionsRevision ? structuredClone(row.propertyExceptionsRevision) : void 0,
           style: row.style ? {
             ...row.style,
             revision: row.style.revision ? { ...row.style.revision } : void 0,
@@ -52400,7 +52448,16 @@ function transformRow(row, path, context2) {
   let next = resolveRowStructuralRevision(row, path, context2);
   const style2 = resolveRowPropertyStyle(next.style, `${path}.style`, context2);
   if (style2 !== next.style) next = { ...next, style: style2 };
-  if (next.tblPrExChangeXml) {
+  const propertyExceptionsRevision = next.propertyExceptionsRevision;
+  if (propertyExceptionsRevision && matchesRevision(context2, propertyExceptionsRevision.id)) {
+    markResolved(context2, propertyExceptionsRevision.id);
+    next = {
+      ...next,
+      propertyExceptions: context2.action === "accept" ? next.propertyExceptions : structuredClone(propertyExceptionsRevision.previous),
+      propertyExceptionsRevision: void 0,
+      tblPrExChangeXml: void 0
+    };
+  } else if (next.tblPrExChangeXml && !propertyExceptionsRevision) {
     const revisionId = rawRevisionId(next.tblPrExChangeXml);
     if (revisionId && matchesRevision(context2, revisionId)) {
       markMatched(context2);
@@ -52412,7 +52469,7 @@ function transformRow(row, path, context2) {
           kind: "table-property-exception-original-unavailable",
           revisionId,
           path: `${path}.tblPrExChangeXml`,
-          message: "w:tblPrExChange is still preservation-only; its previous properties are not semantically decoded yet."
+          message: "The imported w:tblPrExChange has no decodable previous w:tblPrEx snapshot."
         });
       }
     }

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { dN, ah, aw, aM, aG, dO, dP, dQ, aA, dR, ai, dS, dw, aN, dT, dU, aL, aD, dV, dW, dX, ag, dY, du, aP, dZ, d_, d$, e0, e1, dI, e2, e3, e4, aU, aT, e5, aE, e6, e7, e8, e9, ea, eb, aI, aF, ec, b3, aO, b2, aV, az, aK, dH, ed, dO as dO2, dV as dV2, dY as dY2, e5 as e52, e6 as e62, eb as eb2, ee, ef, dy, dt, eg, eh, ei, ej, ek, el, em, dv, en, eo, ep, eq, er, dx, es, et } from "./index-C0KjmCqU.js";
+import { dN, ah, aw, aM, aG, dO, dP, dQ, aA, dR, ai, dS, dw, aN, dT, dU, aL, aD, dV, dW, dX, ag, dY, du, aP, dZ, d_, d$, e0, e1, dI, e2, e3, e4, aU, aT, e5, aE, e6, e7, e8, e9, ea, eb, aI, aF, ec, b3, aO, b2, aV, az, aK, dH, ed, dO as dO2, dV as dV2, dY as dY2, e5 as e52, e6 as e62, eb as eb2, ee, ef, dy, dt, eg, eh, ei, ej, ek, el, em, dv, en, eo, ep, eq, er, dx, es, et } from "./index-BbOqOr2T.js";
 export {
   dN as ActionRow,
   ah as BalloonShell,