@arbidocs/blocks 0.4.120 → 0.4.121

package/node_modules/@arbidocs/coedit/dist/{port-ip7WByvH.d.cts → port-BbN5OZHx.d.cts}

@@ -51,7 +51,30 @@ interface DocParagraph {
     marks?: DocMark[];
     /** Its footnote and endnote references. */
     notes?: DocNote[];
+    /** Its pending tracked insertions and deletions, in document order. */
+    revisions?: DocRevision[];
 }
+/**
+ * A pending tracked change in a paragraph. `text` leaves deleted text out, while the engine's
+ * offsets (a {@link DocPoint}) count it: an insertion covers `length` characters of `text` from
+ * `offset`; a deletion's `text` sits at `offset`, between the characters of `text` around it.
+ */
+interface DocRevision {
+    kind: 'insert' | 'delete';
+    offset: number;
+    length: number;
+    author?: string;
+    /** A deletion's text. */
+    text?: string;
+}
+/**
+ * Where a position in a paragraph's `text` is in the engine's offsets, which count pending
+ * deleted text. `pastDeletions`: a position with deleted text right at it is placed after that
+ * text rather than before it.
+ */
+declare function engineOffset(paragraph: DocParagraph, offset: number, pastDeletions?: boolean): number;
+/** A paragraph's length in the engine's offsets: its text and its pending deleted text. */
+declare const engineLength: (paragraph: DocParagraph) => number;
 /** A stretch of a paragraph's text in a watched character style. */
 interface DocMark {
     styleId: string;
@@ -185,4 +208,4 @@ interface ReferencesPort extends DefinitionsPort {
     runsXml(paragraphId: string): string | null;
 }
 
-export { BROKEN_CROSS_REFERENCE_STYLE as B, CROSS_REFERENCE_STYLE as C, DEFINED_TERM_STYLE as D, FIELD_ATOM as F, type LevelInfo as L, type NumberingSource as N, type OoxmlNodeLike as O, type ReferencesPort as R, WATCHED_STYLES as W, type CrossReferenceTarget as a, type DefinitionsPort as b, type DocField as c, type DocLink as d, type DocMark as e, type DocNote as f, type DocParagraph as g, type DocPoint as h, type DocumentNumbering as i, type LevelOf as j, type ListItemInfo as k, documentNumbering as l, filterTargets as m, listTargets as n, paragraphNumber as p, readParagraphs as r, styleNames as s };
+export { BROKEN_CROSS_REFERENCE_STYLE as B, CROSS_REFERENCE_STYLE as C, DEFINED_TERM_STYLE as D, FIELD_ATOM as F, type LevelInfo as L, type NumberingSource as N, type OoxmlNodeLike as O, type ReferencesPort as R, WATCHED_STYLES as W, type CrossReferenceTarget as a, type DefinitionsPort as b, type DocField as c, type DocLink as d, type DocMark as e, type DocNote as f, type DocParagraph as g, type DocPoint as h, type DocRevision as i, type DocumentNumbering as j, type LevelOf as k, type ListItemInfo as l, documentNumbering as m, engineLength as n, engineOffset as o, filterTargets as p, listTargets as q, paragraphNumber as r, readParagraphs as s, styleNames as t };

package/node_modules/@arbidocs/coedit/dist/{port-ip7WByvH.d.ts → port-BbN5OZHx.d.ts}

@@ -51,7 +51,30 @@ interface DocParagraph {
     marks?: DocMark[];
     /** Its footnote and endnote references. */
     notes?: DocNote[];
+    /** Its pending tracked insertions and deletions, in document order. */
+    revisions?: DocRevision[];
 }
+/**
+ * A pending tracked change in a paragraph. `text` leaves deleted text out, while the engine's
+ * offsets (a {@link DocPoint}) count it: an insertion covers `length` characters of `text` from
+ * `offset`; a deletion's `text` sits at `offset`, between the characters of `text` around it.
+ */
+interface DocRevision {
+    kind: 'insert' | 'delete';
+    offset: number;
+    length: number;
+    author?: string;
+    /** A deletion's text. */
+    text?: string;
+}
+/**
+ * Where a position in a paragraph's `text` is in the engine's offsets, which count pending
+ * deleted text. `pastDeletions`: a position with deleted text right at it is placed after that
+ * text rather than before it.
+ */
+declare function engineOffset(paragraph: DocParagraph, offset: number, pastDeletions?: boolean): number;
+/** A paragraph's length in the engine's offsets: its text and its pending deleted text. */
+declare const engineLength: (paragraph: DocParagraph) => number;
 /** A stretch of a paragraph's text in a watched character style. */
 interface DocMark {
     styleId: string;
@@ -185,4 +208,4 @@ interface ReferencesPort extends DefinitionsPort {
     runsXml(paragraphId: string): string | null;
 }
 
-export { BROKEN_CROSS_REFERENCE_STYLE as B, CROSS_REFERENCE_STYLE as C, DEFINED_TERM_STYLE as D, FIELD_ATOM as F, type LevelInfo as L, type NumberingSource as N, type OoxmlNodeLike as O, type ReferencesPort as R, WATCHED_STYLES as W, type CrossReferenceTarget as a, type DefinitionsPort as b, type DocField as c, type DocLink as d, type DocMark as e, type DocNote as f, type DocParagraph as g, type DocPoint as h, type DocumentNumbering as i, type LevelOf as j, type ListItemInfo as k, documentNumbering as l, filterTargets as m, listTargets as n, paragraphNumber as p, readParagraphs as r, styleNames as s };
+export { BROKEN_CROSS_REFERENCE_STYLE as B, CROSS_REFERENCE_STYLE as C, DEFINED_TERM_STYLE as D, FIELD_ATOM as F, type LevelInfo as L, type NumberingSource as N, type OoxmlNodeLike as O, type ReferencesPort as R, WATCHED_STYLES as W, type CrossReferenceTarget as a, type DefinitionsPort as b, type DocField as c, type DocLink as d, type DocMark as e, type DocNote as f, type DocParagraph as g, type DocPoint as h, type DocRevision as i, type DocumentNumbering as j, type LevelOf as k, type ListItemInfo as l, documentNumbering as m, engineLength as n, engineOffset as o, filterTargets as p, listTargets as q, paragraphNumber as r, readParagraphs as s, styleNames as t };

package/node_modules/@arbidocs/coedit/dist/server.cjs

@@ -69,6 +69,7 @@ function readParagraph(node, topLevel, bookmarks) {
   let runStyle;
   const fields = [];
   const notes = [];
+  const revisions = [];
   let current = null;
   const field = (c) => {
     const type = attr(c, "fldCharType");
@@ -110,7 +111,31 @@ function readParagraph(node, topLevel, bookmarks) {
         }
         continue;
       }
-      if (c.localName === "delText" || c.localName === "del" || c.localName === "rPr") continue;
+      if (c.localName === "del") {
+        const deleted = deletedText(c);
+        if (deleted && fieldDepth === 0)
+          revisions.push({
+            kind: "delete",
+            offset: text.length,
+            length: deleted.length,
+            author: attr(c, "author"),
+            text: deleted
+          });
+        continue;
+      }
+      if (c.localName === "ins") {
+        const start = text.length;
+        walk(c, link);
+        if (text.length > start && fieldDepth === 0)
+          revisions.push({
+            kind: "insert",
+            offset: start,
+            length: text.length - start,
+            author: attr(c, "author")
+          });
+        continue;
+      }
+      if (c.localName === "delText" || c.localName === "rPr") continue;
       if (c.localName === "r") {
         const rStyle = c.children?.find((x) => x.localName === "rPr")?.children?.find((x) => x.localName === "rStyle");
         const watched = rStyle && attr(rStyle, "val");
@@ -173,9 +198,20 @@ function readParagraph(node, topLevel, bookmarks) {
     links,
     ...fields.length ? { fields } : {},
     ...marks.length ? { marks } : {},
-    ...notes.length ? { notes } : {}
+    ...notes.length ? { notes } : {},
+    ...revisions.length ? { revisions } : {}
   };
 }
+function deletedText(node) {
+  let out = "";
+  for (const c of node.children ?? []) {
+    if (c.localName === "instrText") continue;
+    if (c.localName === "delText") out += (c.children ?? []).map((t) => t.value ?? "").join("");
+    else if (c.localName === "tab") out += "	";
+    else if (c.localName !== "rPr") out += deletedText(c);
+  }
+  return out;
+}
 function documentNumbering(source) {
   let numbering;
   let cascade;
@@ -1350,6 +1386,10 @@ var NodeRegistry = class {
   get(id) {
     return this.entries.get(id);
   }
+  /** Whether the id names a node, one inside a paragraph that is not open yet included. */
+  has(id) {
+    return (this.entries.get(id) ?? this.resolveInsideParagraph(id)) !== void 0;
+  }
   require(id) {
     let entry = this.entries.get(id) ?? this.resolveInsideParagraph(id);
     if (!entry) throw new RegistryError(`journal names unknown node ${id}`);
@@ -1750,8 +1790,31 @@ function moveNode(registry, id, destinationId, destinationIndex) {
   const destination = childrenOf(asLiveElement(destinationEntry.live, destinationId));
   destination.insert(destinationIndex, [registry.toLive(copy)]);
 }
+function renameNode(registry, id, qname) {
+  const entry = registry.require(id);
+  if ("plain" in entry) {
+    const el2 = entry.plain;
+    if (el2.type !== "element") return false;
+    el2.ns = qname.namespaceUri;
+    el2.local = qname.localName;
+    if (qname.prefix === void 0) delete el2.prefix;
+    else el2.prefix = qname.prefix;
+    registry.touch(el2);
+    return true;
+  }
+  const live = entry.live;
+  if (live instanceof Y3__namespace.Text || isRichParagraph(live)) return false;
+  if (live.get("ns") !== qname.namespaceUri) live.set("ns", qname.namespaceUri);
+  if (live.get("local") !== qname.localName) live.set("local", qname.localName);
+  if (qname.prefix === void 0) {
+    if (live.has("prefix")) live.delete("prefix");
+  } else if (live.get("prefix") !== qname.prefix) live.set("prefix", qname.prefix);
+  return true;
+}
 function putNode(registry, effect) {
   const d = effect.descriptor;
+  if (d.kind !== "textValue" && registry.has(d.logicalId) && renameNode(registry, d.logicalId, d.qname))
+    return;
   if (d.kind === "textValue") {
     registry.registerPlain({ type: "text", id: d.logicalId, value: "" });
     return;