oasis-editor 0.0.162 → 0.0.164

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

@@ -8,6 +8,22 @@ declare module "./nodes.js" {
     interface EditorRunBase {
         /** Enclosing inline `w:sdt` content controls, outermost first. */
         sdtWrappers?: EditorSdtBlockWrapper[];
+        /**
+         * Zero-length Word move-container boundary (`moveFrom/ToRangeStart/End`).
+         * Start markers carry CT_MoveBookmark metadata; end markers retain the
+         * matching id and optional custom-XML displacement hint.
+         */
+        revisionRangeMarker?: {
+            move: "from" | "to";
+            edge: "start" | "end";
+            id: string;
+            name?: string;
+            author?: string;
+            date?: number;
+            columnFirst?: number;
+            columnLast?: number;
+            displacedByCustomXml?: string;
+        };
     }
     interface EditorTableRowNode {
         /** Enclosing row-level `w:sdt` content controls, outermost first. */

package/dist/export/docx/text/revisionXml.d.ts

@@ -0,0 +1,15 @@
+import { EditorRevision, EditorRunBase } from '../../../core/model.js';
+
+/**
+ * Word stores visible text from deletion-like revisions in `w:delText` and
+ * deleted field instructions in `w:delInstrText`. Canonical run generation uses
+ * the ordinary tags, so normalize only direct run children here. If a source
+ * overlay retained stale deleted-text children after an edit, the generated
+ * ordinary child is authoritative and the stale counterpart is removed first.
+ */
+export declare function serializeDeletionRunContent(xml: string): string;
+export declare function serializeRunRevisionWrapper(innerXml: string, revision: EditorRevision): string;
+type MoveRangeMarker = NonNullable<EditorRunBase["revisionRangeMarker"]>;
+/** Serializes a zero-length move source/destination container boundary. */
+export declare function serializeMoveRangeMarker(marker: MoveRangeMarker): string;
+export {};

package/dist/import/docx/runs/types.d.ts

@@ -1,5 +1,5 @@
 import { Element as XmlElement } from '@xmldom/xmldom';
-import { EditorBlockNode, EditorTextStyle, EditorImageRunData, EditorTextBoxData, EditorMathExpression, EditorRevision, EditorSdtBlockWrapper } from '../../../core/model.js';
+import { EditorBlockNode, EditorTextStyle, EditorImageRunData, EditorTextBoxData, EditorMathExpression, EditorRevision, EditorRunBase, EditorSdtBlockWrapper } from '../../../core/model.js';
 
 export type ParseNestedBlocks = (container: XmlElement) => Promise<EditorBlockNode[]>;
 /**
@@ -30,6 +30,8 @@ export interface ImportedRun {
     styles?: EditorTextStyle;
     /** Tracked insertion/deletion, optionally paired as a Word move. */
     revision?: EditorRevision;
+    /** Zero-length move range start/end marker retained in inline order. */
+    revisionRangeMarker?: EditorRunBase["revisionRangeMarker"];
     /** Enclosing inline `w:sdt` wrappers, outermost first. */
     sdtWrappers?: EditorSdtBlockWrapper[];
     field?: {

package/dist/{index-BY8DRmWC.js → index-BGlDfVIA.js}

@@ -2863,7 +2863,7 @@ function OasisEditorAppLazy(props = {}) {
     onCleanup(() => {
       cancelled = true;
     });
-    import("./OasisEditorApp-1SLQ3toO.js").then((m) => {
+    import("./OasisEditorApp-B5U2tjAM.js").then((m) => {
       cancelled = true;
       setProgress(1);
       setTimeout(() => setApp(() => m.OasisEditorApp), 180);
@@ -39752,6 +39752,57 @@ function parseCommentMarker(element) {
     docxId
   };
 }
+function fallbackRevisionId(element) {
+  const xml = new XMLSerializer().serializeToString(element);
+  let hash = 2166136261;
+  for (let index = 0; index < xml.length; index += 1) {
+    hash ^= xml.charCodeAt(index);
+    hash = Math.imul(hash, 16777619);
+  }
+  return `revision:${hash >>> 0}`;
+}
+function parseRevisionContainer(element) {
+  const kind = element.localName;
+  if (kind !== "ins" && kind !== "del" && kind !== "moveFrom" && kind !== "moveTo") {
+    return void 0;
+  }
+  const rawDate = getAttributeValue(element, "date");
+  const parsedDate = rawDate ? Date.parse(rawDate) : Number.NaN;
+  const isDeletion = kind === "del" || kind === "moveFrom";
+  return {
+    id: getAttributeValue(element, "id") ?? fallbackRevisionId(element),
+    type: isDeletion ? "delete" : "insert",
+    author: getAttributeValue(element, "author") ?? "Unknown",
+    date: Number.isFinite(parsedDate) ? parsedDate : 0,
+    ...kind === "moveFrom" ? { move: "from" } : kind === "moveTo" ? { move: "to" } : {}
+  };
+}
+function parseMoveRangeMarker(element) {
+  const match = /^move(From|To)Range(Start|End)$/.exec(element.localName ?? "");
+  if (!match) return void 0;
+  const move = match[1] === "From" ? "from" : "to";
+  const edge = match[2] === "Start" ? "start" : "end";
+  const rawDate = getAttributeValue(element, "date");
+  const parsedDate = rawDate ? Date.parse(rawDate) : Number.NaN;
+  const colFirstRaw = getAttributeValue(element, "colFirst");
+  const colLastRaw = getAttributeValue(element, "colLast");
+  const columnFirst = colFirstRaw !== null ? Number.parseInt(colFirstRaw, 10) : Number.NaN;
+  const columnLast = colLastRaw !== null ? Number.parseInt(colLastRaw, 10) : Number.NaN;
+  const name = getAttributeValue(element, "name") ?? void 0;
+  const author = getAttributeValue(element, "author") ?? void 0;
+  const displacedByCustomXml = getAttributeValue(element, "displacedByCustomXml") ?? void 0;
+  return {
+    move,
+    edge,
+    id: getAttributeValue(element, "id") ?? fallbackRevisionId(element),
+    ...name !== void 0 ? { name } : {},
+    ...author !== void 0 ? { author } : {},
+    ...Number.isFinite(parsedDate) ? { date: parsedDate } : {},
+    ...Number.isFinite(columnFirst) ? { columnFirst } : {},
+    ...Number.isFinite(columnLast) ? { columnLast } : {},
+    ...displacedByCustomXml !== void 0 ? { displacedByCustomXml } : {}
+  };
+}
 async function parseRunElement(runElement, zip, relsMap, assets, parseNestedBlocks) {
   const textParts = [];
   let image;
@@ -39772,7 +39823,7 @@ async function parseRunElement(runElement, zip, relsMap, assets, parseNestedBloc
     }
     const element = node;
     if (element.namespaceURI === WORD_NS$3) {
-      if (element.localName === "t") {
+      if (element.localName === "t" || element.localName === "delText") {
         pushText(element.textContent ?? "");
       } else if (element.localName === "tab") {
         pushText("	");
@@ -39959,6 +40010,31 @@ async function parseRunsContainer(container, numberingMaps, zip, relsMap, assets
       runs.push({ text: "", comment: marker });
       continue;
     }
+    const moveRangeMarker = parseMoveRangeMarker(element);
+    if (moveRangeMarker) {
+      runs.push({ text: "", revisionRangeMarker: moveRangeMarker });
+      continue;
+    }
+    const revision = parseRevisionContainer(element);
+    if (revision) {
+      const nestedRuns = await parseRunsContainer(
+        element,
+        numberingMaps,
+        zip,
+        relsMap,
+        assets,
+        theme,
+        inheritedLink,
+        parseNestedBlocks
+      );
+      for (const nestedRun of nestedRuns) {
+        runs.push({
+          ...nestedRun,
+          revision: nestedRun.revision ?? revision
+        });
+      }
+      continue;
+    }
     if (element.localName === "sdt") {
       const sdtContent = getFirstChildByTagNameNS(element, WORD_NS$3, "sdtContent");
       if (!sdtContent) {
@@ -39994,7 +40070,7 @@ async function parseRunsContainer(container, numberingMaps, zip, relsMap, assets
         getFirstChildByTagNameNS(element, WORD_NS$3, "rPr"),
         theme
       );
-      const hasFieldControl = getChildrenByTagNameNS(element, WORD_NS$3, "fldChar").length > 0 || getChildrenByTagNameNS(element, WORD_NS$3, "instrText").length > 0;
+      const hasFieldControl = getChildrenByTagNameNS(element, WORD_NS$3, "fldChar").length > 0 || getChildrenByTagNameNS(element, WORD_NS$3, "instrText").length > 0 || getChildrenByTagNameNS(element, WORD_NS$3, "delInstrText").length > 0;
       if (hasFieldControl) {
         for (let child2 = 0; child2 < element.childNodes.length; child2 += 1) {
           const childNode = element.childNodes[child2];
@@ -40007,7 +40083,7 @@ async function parseRunsContainer(container, numberingMaps, zip, relsMap, assets
           }
           if (childElement.localName === "fldChar") {
             onFldChar(childElement, runStyles);
-          } else if (childElement.localName === "instrText") {
+          } else if (childElement.localName === "instrText" || childElement.localName === "delInstrText") {
             onInstrText(childElement, runStyles);
           }
         }
@@ -40540,6 +40616,9 @@ function importedRunToEditorRun(run) {
   if (run.revision) {
     base.revision = { ...run.revision };
   }
+  if (run.revisionRangeMarker) {
+    base.revisionRangeMarker = { ...run.revisionRangeMarker };
+  }
   if ((_a2 = run.sdtWrappers) == null ? void 0 : _a2.length) {
     base.sdtWrappers = [...run.sdtWrappers];
   }
@@ -40622,7 +40701,7 @@ function splitRunsAtPageBreaks(runs) {
   const segments = [[]];
   let hasPageBreak = false;
   const appendRun = (run, text2) => {
-    if (text2.length === 0 && !run.image && !run.textBox && !run.field && !run.fieldChar && run.fieldInstruction === void 0 && !run.bookmark && !run.comment) {
+    if (text2.length === 0 && !run.image && !run.textBox && !run.field && !run.fieldChar && run.fieldInstruction === void 0 && !run.bookmark && !run.comment && !run.revisionRangeMarker) {
       return;
     }
     segments[segments.length - 1].push({
@@ -40648,7 +40727,7 @@ function splitRunsAtPageBreaks(runs) {
 }
 function paragraphHasVisibleContent(runs) {
   return runs.some(
-    (run) => run.image || run.textBox || run.field || run.fieldChar || run.fieldInstruction !== void 0 || run.bookmark || run.comment || run.text.replace(/\s/g, "").length > 0
+    (run) => run.image || run.textBox || run.field || run.fieldChar || run.fieldInstruction !== void 0 || run.bookmark || run.comment || run.revisionRangeMarker || run.text.replace(/\s/g, "").length > 0
   );
 }
 async function parseParagraphNodes(paragraphNode, numberingMaps, zip, relsMap, assets, theme, parseNestedBlocks, inheritedStyle) {
@@ -43259,7 +43338,7 @@ function wrapTableStructuralSdts(table, tableElement) {
     }))
   );
 }
-function elementChildren(node) {
+function elementChildren$1(node) {
   const children2 = [];
   for (let index = 0; index < node.childNodes.length; index += 1) {
     const child2 = node.childNodes[index];
@@ -43311,8 +43390,8 @@ function matchingChildByOccurrence(sourceChildren, sourceIndex, generatedChildre
 }
 function mergeNestedExtensionMarkup(source, generated) {
   copyExtensionAttributes(source, generated);
-  const sourceChildren = elementChildren(source);
-  const generatedChildren = elementChildren(generated);
+  const sourceChildren = elementChildren$1(source);
+  const generatedChildren = elementChildren$1(generated);
   sourceChildren.forEach((sourceChild, sourceIndex) => {
     const generatedChild = matchingChildByOccurrence(
       sourceChildren,
@@ -45145,7 +45224,139 @@ function mergeRunOoxmlSourceIntoGeneratedXml(run, generatedXml) {
   mergeSourceRunChildren(sourceRun, generatedRun);
   return new XMLSerializer().serializeToString(generatedRun);
 }
+const WRAPPER_XMLNS = `xmlns:oasis="urn:oasis:docx" xmlns:w="${WORD_NS$1}" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"`;
+function elementChildren(element) {
+  const result = [];
+  for (let index = 0; index < element.childNodes.length; index += 1) {
+    const child2 = element.childNodes[index];
+    if ((child2 == null ? void 0 : child2.nodeType) === child2.ELEMENT_NODE) {
+      result.push(child2);
+    }
+  }
+  return result;
+}
+function parseSingleRun(xml) {
+  const wrapper = new DOMParser$1().parseFromString(
+    `<oasis:root ${WRAPPER_XMLNS}>${xml}</oasis:root>`,
+    "application/xml"
+  ).documentElement;
+  if (!wrapper) return void 0;
+  const children2 = elementChildren(wrapper);
+  if (children2.length !== 1) return void 0;
+  const run = children2[0];
+  return run.namespaceURI === WORD_NS$1 && run.localName === "r" ? run : void 0;
+}
+function replaceWordChildName(parent, source, targetLocalName) {
+  const ownerDocument = parent.ownerDocument;
+  if (!ownerDocument) return;
+  const replacement = ownerDocument.createElementNS(
+    WORD_NS$1,
+    `w:${targetLocalName}`
+  );
+  for (let index = 0; index < source.attributes.length; index += 1) {
+    const attribute = source.attributes.item(index);
+    if (!attribute) continue;
+    if (attribute.namespaceURI) {
+      replacement.setAttributeNS(
+        attribute.namespaceURI,
+        attribute.name,
+        attribute.value
+      );
+    } else {
+      replacement.setAttribute(attribute.name, attribute.value);
+    }
+  }
+  while (source.firstChild) {
+    replacement.appendChild(source.firstChild);
+  }
+  parent.replaceChild(replacement, source);
+}
+function serializeDeletionRunContent(xml) {
+  const run = parseSingleRun(xml);
+  if (!run) return xml;
+  const children2 = elementChildren(run);
+  const generatedText = children2.filter(
+    (child2) => child2.namespaceURI === WORD_NS$1 && child2.localName === "t"
+  );
+  if (generatedText.length > 0) {
+    for (const child2 of children2) {
+      if (child2.namespaceURI === WORD_NS$1 && child2.localName === "delText") {
+        run.removeChild(child2);
+      }
+    }
+    for (const child2 of generatedText) {
+      replaceWordChildName(run, child2, "delText");
+    }
+  }
+  const refreshed = elementChildren(run);
+  const generatedInstructions = refreshed.filter(
+    (child2) => child2.namespaceURI === WORD_NS$1 && child2.localName === "instrText"
+  );
+  if (generatedInstructions.length > 0) {
+    for (const child2 of refreshed) {
+      if (child2.namespaceURI === WORD_NS$1 && child2.localName === "delInstrText") {
+        run.removeChild(child2);
+      }
+    }
+    for (const child2 of generatedInstructions) {
+      replaceWordChildName(run, child2, "delInstrText");
+    }
+  }
+  return new XMLSerializer().serializeToString(run);
+}
+function revisionNumericId(id) {
+  if (/^\d+$/.test(id)) return id;
+  return String(
+    Array.from(id).reduce(
+      (hash, character) => hash * 31 + character.charCodeAt(0) >>> 0,
+      0
+    )
+  );
+}
+function revisionElementName(revision) {
+  if (revision.move === "from") return "moveFrom";
+  if (revision.move === "to") return "moveTo";
+  return revision.type === "delete" ? "del" : "ins";
+}
+function serializeRunRevisionWrapper(innerXml, revision) {
+  const date = Number.isFinite(revision.date) ? new Date(revision.date).toISOString() : (/* @__PURE__ */ new Date(0)).toISOString();
+  const attributes = `w:id="${revisionNumericId(revision.id)}" w:author="${escapeXml(revision.author)}" w:date="${date}"`;
+  const element = revisionElementName(revision);
+  return `<w:${element} ${attributes}>${innerXml}</w:${element}>`;
+}
+function serializeMoveRangeMarker(marker) {
+  const element = `move${marker.move === "from" ? "From" : "To"}Range${marker.edge === "start" ? "Start" : "End"}`;
+  const attributes = [
+    `w:id="${revisionNumericId(marker.id)}"`
+  ];
+  if (marker.displacedByCustomXml !== void 0) {
+    attributes.push(
+      `w:displacedByCustomXml="${escapeXml(marker.displacedByCustomXml)}"`
+    );
+  }
+  if (marker.edge === "start") {
+    if (marker.name !== void 0) {
+      attributes.push(`w:name="${escapeXml(marker.name)}"`);
+    }
+    if (marker.author !== void 0) {
+      attributes.push(`w:author="${escapeXml(marker.author)}"`);
+    }
+    if (marker.date !== void 0 && Number.isFinite(marker.date)) {
+      attributes.push(`w:date="${new Date(marker.date).toISOString()}"`);
+    }
+    if (marker.columnFirst !== void 0) {
+      attributes.push(`w:colFirst="${Math.trunc(marker.columnFirst)}"`);
+    }
+    if (marker.columnLast !== void 0) {
+      attributes.push(`w:colLast="${Math.trunc(marker.columnLast)}"`);
+    }
+  }
+  return `<w:${element} ${attributes.join(" ")}/>`;
+}
 function serializeRun(run, context2, paragraphStyleId, styles, serializeBlocksXml2) {
+  if (run.revisionRangeMarker) {
+    return serializeMoveRangeMarker(run.revisionRangeMarker);
+  }
   if (run.__isFootnoteRefMarker) {
     return serializeFootnoteRefMarker();
   }
@@ -45194,19 +45405,23 @@ function serializeRun(run, context2, paragraphStyleId, styles, serializeBlocksXm
   return mergeRunOoxmlSourceIntoGeneratedXml(run, generatedXml);
 }
 function serializeRunWithRelationships(run, context2, paragraphStyleId, styles, serializeBlocksXml2) {
-  var _a2;
-  const runXml = serializeRun(
+  var _a2, _b2;
+  let runXml = serializeRun(
     run,
     context2,
     paragraphStyleId,
     styles,
     serializeBlocksXml2
   );
-  const href = (_a2 = run.styles) == null ? void 0 : _a2.link;
-  if (!href) {
+  if (run.revisionRangeMarker) {
     return runXml;
   }
-  return wrapRunWithHyperlink(runXml, href, context2);
+  if (((_a2 = run.revision) == null ? void 0 : _a2.type) === "delete") {
+    runXml = serializeDeletionRunContent(runXml);
+  }
+  const href = (_b2 = run.styles) == null ? void 0 : _b2.link;
+  const linkedXml = href ? wrapRunWithHyperlink(runXml, href, context2) : runXml;
+  return run.revision ? serializeRunRevisionWrapper(linkedXml, run.revision) : linkedXml;
 }
 function serializeRunsWithInlineSdts(runs, serializeRun2) {
   var _a2, _b2, _c;
@@ -46590,6 +46805,7 @@ function cloneRun(run) {
     text: run.text,
     styles: cloneStyle(run.styles),
     revision: run.revision ? { ...run.revision } : void 0,
+    revisionRangeMarker: run.revisionRangeMarker ? { ...run.revisionRangeMarker } : void 0,
     sdtWrappers: run.sdtWrappers ? [...run.sdtWrappers] : void 0
   };
   const cloned = visitRun(run, {
@@ -47571,7 +47787,7 @@ async function importDocxInWorker(buffer, options = {}) {
     const worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "" + new URL("assets/importDocxWorker-BnENWXFH.js", import.meta.url).href,
+        "" + new URL("assets/importDocxWorker-q9FwIHr4.js", import.meta.url).href,
         import.meta.url
       ),
       {

package/dist/oasis-editor.js

@@ -1,4 +1,4 @@
-import { dK, ah, aw, aM, aG, dL, dM, dN, aA, dO, ai, dP, dt, aN, dQ, dR, aL, aD, dS, dT, dU, ag, dV, dr, aP, dW, dX, dY, dZ, d_, dF, d$, e0, e1, aU, aT, e2, aE, e3, e4, e5, e6, e7, e8, aI, aF, e9, b3, aO, b2, aV, az, aK, dE, ea, dL as dL2, dS as dS2, dV as dV2, e2 as e22, e3 as e32, e8 as e82, eb, ec, dv, dq, ed, ee, ef, eg, eh, ei, ej, ds, ek, el, em, du, en } from "./index-BY8DRmWC.js";
+import { dK, ah, aw, aM, aG, dL, dM, dN, aA, dO, ai, dP, dt, aN, dQ, dR, aL, aD, dS, dT, dU, ag, dV, dr, aP, dW, dX, dY, dZ, d_, dF, d$, e0, e1, aU, aT, e2, aE, e3, e4, e5, e6, e7, e8, aI, aF, e9, b3, aO, b2, aV, az, aK, dE, ea, dL as dL2, dS as dS2, dV as dV2, e2 as e22, e3 as e32, e8 as e82, eb, ec, dv, dq, ed, ee, ef, eg, eh, ei, ej, ds, ek, el, em, du, en } from "./index-BGlDfVIA.js";
 export {
   dK as ActionRow,
   ah as BalloonShell,