@arbidocs/coedit 0.5.21 → 0.5.22

package/dist/server.d.cts

@@ -6,7 +6,7 @@ import { TreePackageStore, PackageTransactResult, HeadlessDocumentView, ImageDec
 import { R as ReferencesPort } from './port-BbN5OZHx.cjs';
 import { R as Revision } from './track-eYC94jTp.cjs';
 import { D as DocxCollaborationSession } from './session-WGvWs6yO.cjs';
-export { C as COLLAB_PROTOCOL, D as DOCUMENT_COLLABORATION_VERSIONS } from './versions-DXiFQMA6.cjs';
+export { C as COLLAB_PROTOCOL, D as DOCUMENT_COLLABORATION_VERSIONS } from './versions-XSYTVmOU.cjs';
 import 'y-protocols/awareness';
 import '@docx-editor.dev/core/collaboration/replication';
 

package/dist/server.d.ts

@@ -6,7 +6,7 @@ import { TreePackageStore, PackageTransactResult, HeadlessDocumentView, ImageDec
 import { R as ReferencesPort } from './port-BbN5OZHx.js';
 import { R as Revision } from './track-eYC94jTp.js';
 import { D as DocxCollaborationSession } from './session-WGvWs6yO.js';
-export { C as COLLAB_PROTOCOL, D as DOCUMENT_COLLABORATION_VERSIONS } from './versions-DXiFQMA6.js';
+export { C as COLLAB_PROTOCOL, D as DOCUMENT_COLLABORATION_VERSIONS } from './versions-XSYTVmOU.js';
 import 'y-protocols/awareness';
 import '@docx-editor.dev/core/collaboration/replication';
 

package/dist/server.js

@@ -1,10 +1,10 @@
 import { Awareness } from 'y-protocols/awareness';
 import { createServerAutomationHost } from '@docx-editor.dev/core/automation';
 import { createCollaborationDocumentPort, historyGroupOfJournal, mapOffsetAcrossText } from '@docx-editor.dev/core/collaboration/replication';
-import { TreePackageStore, validateRasterHeader, headlessViewOfStore, ORIGIN_IDS, readOoxmlPackage, writeOoxmlPackage, readOoxmlPart, validateExternalTarget, relsPartNameFor, contentTypesPartBytes, withContentTypeOverride, readXml } from '@docx-editor.dev/core/store';
+import { TreePackageStore, validateRasterHeader, headlessViewOfStore, ORIGIN_IDS, readOoxmlPackage, writeOoxmlPackage, readOoxmlPart, validateExternalTarget, relsPartNameFor, contentTypesPartBytes, withContentTypeOverride, readXml, XML_NAMESPACE_URI } from '@docx-editor.dev/core/store';
 import { resolveNumberingLevel, resolveStoryListItems, buildStyleCascadeTable, withNumberingStyleLinks, buildNumberingIndex } from '@docx-editor.dev/core/layout';
 import { zipSync, strToU8, strFromU8, unzipSync } from 'fflate';
-import * as Y3 from 'yjs';
+import * as Y from 'yjs';
 import { createCollaborationStatusTracker, safeParticipantColor } from '@docx-editor.dev/core/collaboration';
 
 // src/server.ts
@@ -874,6 +874,92 @@ function writeUnits(text, units) {
 function isRichParagraph(map) {
   return map.has("inline");
 }
+var PACKED = "xml";
+function isPackedElement(map) {
+  return map.has(PACKED);
+}
+function isCompact(map) {
+  return isRichParagraph(map) || isPackedElement(map);
+}
+var TEXT_BEARING = /* @__PURE__ */ new Set(["p", "t", "delText", "instrText", "delInstrText"]);
+function packable(xml) {
+  if (xml.ns === WML2 && TEXT_BEARING.has(xml.local)) return false;
+  return xml.children.every((c) => typeof c === "string" || packable(c));
+}
+function createPacked(xml, scope) {
+  const map = new Y.Map();
+  map.set(PACKED, serializeXml(xml, scope));
+  return map;
+}
+function repack(map, xml) {
+  const next = serializeXml(xml, scopeOf(map));
+  if (map.get(PACKED) !== next) map.set(PACKED, next);
+}
+function scopeOf(node) {
+  const chain = [];
+  let parent = node.parent;
+  while (parent instanceof Y.Array) {
+    const owner = parent.parent;
+    if (!(owner instanceof Y.Map)) break;
+    chain.push(owner);
+    parent = owner.parent;
+  }
+  const scope = /* @__PURE__ */ new Map();
+  for (const el2 of chain.reverse()) {
+    for (const b of el2.get("bindings").toArray()) scope.set(b.prefix, b.ns);
+  }
+  return scope;
+}
+function scopeWithin(el2) {
+  const scope = scopeOf(el2);
+  if (!isPackedElement(el2)) {
+    for (const b of el2.get("bindings").toArray()) scope.set(b.prefix, b.ns);
+  }
+  return scope;
+}
+var unpackLimits = { maxBytes: 64 * 1024 * 1024, maxElements: 2e6 };
+function unpack(text, scope) {
+  const read = readXml(text, unpackLimits);
+  if (!read.ok) throw new Error(`collab: a packed element is not readable XML (${read.reason})`);
+  const convert = (node, outer) => {
+    const bindings = [];
+    const named = [];
+    for (const [name, value] of Object.entries(node.attributes)) {
+      if (name === "xmlns") bindings.push({ prefix: "", ns: value });
+      else if (name.startsWith("xmlns:")) bindings.push({ prefix: name.slice(6), ns: value });
+      else named.push([name, value]);
+    }
+    const inner = new Map(outer);
+    for (const b of bindings) inner.set(b.prefix, b.ns);
+    const resolve = (prefix) => {
+      if (prefix === "xml") return XML_NAMESPACE_URI;
+      const ns = inner.get(prefix);
+      if (ns === void 0)
+        throw new Error(`collab: prefix ${prefix} is not bound in a packed element`);
+      return ns;
+    };
+    const colon = node.name.indexOf(":");
+    const xml = {
+      ns: colon < 0 ? inner.get("") ?? "" : resolve(node.name.slice(0, colon)),
+      local: colon < 0 ? node.name : node.name.slice(colon + 1),
+      attrs: named.map(([name, value]) => {
+        const at = name.indexOf(":");
+        if (at < 0) return { ns: "", local: name, value };
+        const prefix = name.slice(0, at);
+        return { ns: resolve(prefix), local: name.slice(at + 1), prefix, value };
+      }),
+      bindings,
+      children: node.children.map(
+        (child) => child.type === "text" ? child.value : convert(child, inner)
+      )
+    };
+    if (colon >= 0) xml.prefix = node.name.slice(0, colon);
+    return xml;
+  };
+  const root = read.nodes.find((n) => n.type === "element");
+  if (!root || root.type !== "element") throw new Error("collab: a packed element is empty");
+  return convert(root, scope);
+}
 function isParagraphEl(el2) {
   return el2.ns === WML2 && el2.local === "p";
 }
@@ -881,47 +967,53 @@ function fieldsOf(map, xml) {
   map.set("ns", xml.ns);
   map.set("local", xml.local);
   if (xml.prefix !== void 0) map.set("prefix", xml.prefix);
-  const attrs = new Y3.Array();
+  const attrs = new Y.Array();
   attrs.push(xml.attrs.map((a) => ({ ...a })));
   map.set("attrs", attrs);
-  const bindings = new Y3.Array();
+  const bindings = new Y.Array();
   bindings.push(xml.bindings.map((b) => ({ ...b })));
   map.set("bindings", bindings);
 }
 function newText(value) {
-  const text = new Y3.Text();
+  const text = new Y.Text();
   text.insert(0, value);
   return text;
 }
-function createRichParagraph(xml, encoded) {
-  const map = new Y3.Map();
+function createRichParagraph(xml, encoded, scope = /* @__PURE__ */ new Map()) {
+  const map = new Y.Map();
   fieldsOf(map, xml);
-  const children = new Y3.Array();
-  children.push(encoded.head.map((el2) => xmlToLive(el2)));
+  const inner = withBindings(scope, xml.bindings);
+  const children = new Y.Array();
+  children.push(encoded.head.map((el2) => xmlToLive(el2, inner)));
   map.set("children", children);
-  const inline = new Y3.Text();
+  const inline = new Y.Text();
   writeUnits(inline, encoded.units);
   map.set("inline", inline);
   return map;
 }
-function xmlToLive(xml) {
+function withBindings(scope, bindings) {
+  const inner = new Map(scope);
+  for (const b of bindings) inner.set(b.prefix, b.ns);
+  return inner;
+}
+function xmlToLive(xml, scope = /* @__PURE__ */ new Map(), root = false) {
   if (isParagraphEl(xml)) {
     const encoded = encodeParagraph(xml.children);
-    if (encoded) return createRichParagraph(xml, encoded);
+    if (encoded) return createRichParagraph(xml, encoded, scope);
   }
-  return xmlToGenericLive(xml);
-}
-function xmlToGenericLive(xml) {
-  const map = new Y3.Map();
+  if (!root && packable(xml)) return createPacked(xml, scope);
+  const map = new Y.Map();
   fieldsOf(map, xml);
-  const children = new Y3.Array();
-  children.push(xml.children.map((c) => typeof c === "string" ? newText(c) : xmlToLive(c)));
+  const inner = withBindings(scope, xml.bindings);
+  const children = new Y.Array();
+  children.push(xml.children.map((c) => typeof c === "string" ? newText(c) : xmlToLive(c, inner)));
   map.set("children", children);
   return map;
 }
 function liveToXml(map) {
+  if (isPackedElement(map)) return unpack(map.get(PACKED), scopeOf(map));
   const prefix = map.get("prefix");
-  const stored = map.get("children").toArray().map((child) => child instanceof Y3.Text ? child.toString() : liveToXml(child));
+  const stored = map.get("children").toArray().map((child) => child instanceof Y.Text ? child.toString() : liveToXml(child));
   const children = isRichParagraph(map) ? [...stored, ...decodeInline(readUnits(map.get("inline")))] : stored;
   const xml = {
     ns: map.get("ns"),
@@ -936,14 +1028,13 @@ function liveToXml(map) {
 var escapeText = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 var escapeAttr = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\t/g, "&#9;").replace(/\n/g, "&#10;").replace(/\r/g, "&#13;");
 var qualified = (prefix, local) => prefix ? `${prefix}:${local}` : local;
-function serializeXml(el2, scope) {
-  const inScope = new Map(scope);
-  for (const b of el2.bindings) inScope.set(b.prefix, b.ns);
-  let out = `<${qualified(el2.prefix, el2.local)}`;
-  for (const b of el2.bindings) {
+function startTag(prefix, local, bindings, attrs, scope) {
+  const inScope = withBindings(scope, bindings);
+  let out = `<${qualified(prefix, local)}`;
+  for (const b of bindings) {
     out += b.prefix === "" ? ` xmlns="${escapeAttr(b.ns)}"` : ` xmlns:${b.prefix}="${escapeAttr(b.ns)}"`;
   }
-  for (const a of el2.attrs) {
+  for (const a of attrs) {
     let p = a.prefix;
     if (a.ns !== "" && !p) {
       for (const [candidate, uri] of inScope) {
@@ -955,48 +1046,41 @@ function serializeXml(el2, scope) {
     }
     out += ` ${qualified(p, a.local)}="${escapeAttr(a.value)}"`;
   }
+  return [out, inScope];
+}
+function serializeXml(el2, scope) {
+  const [out, inScope] = startTag(el2.prefix, el2.local, el2.bindings, el2.attrs, scope);
   if (el2.children.length === 0) return `${out}/>`;
-  out += ">";
+  let body = "";
   for (const child of el2.children) {
-    out += typeof child === "string" ? escapeText(child) : serializeXml(child, inScope);
+    body += typeof child === "string" ? escapeText(child) : serializeXml(child, inScope);
   }
-  return `${out}</${qualified(el2.prefix, el2.local)}>`;
+  return `${out}>${body}</${qualified(el2.prefix, el2.local)}>`;
 }
 function serializeLive(el2, scope) {
-  if (isRichParagraph(el2)) return serializeXml(liveToXml(el2), scope);
+  if (isPackedElement(el2)) return el2.get(PACKED);
   const prefix = el2.get("prefix");
   const local = el2.get("local");
   const bindings = el2.get("bindings").toArray();
   const attrs = el2.get("attrs").toArray();
   const children = el2.get("children").toArray();
-  const inScope = new Map(scope);
-  for (const b of bindings) inScope.set(b.prefix, b.ns);
-  let out = `<${qualified(prefix, local)}`;
-  for (const b of bindings) {
-    out += b.prefix === "" ? ` xmlns="${escapeAttr(b.ns)}"` : ` xmlns:${b.prefix}="${escapeAttr(b.ns)}"`;
-  }
-  for (const a of attrs) {
-    let p = a.prefix;
-    if (a.ns !== "" && !p) {
-      for (const [candidate, uri] of inScope) {
-        if (candidate !== "" && uri === a.ns) {
-          p = candidate;
-          break;
-        }
-      }
-    }
-    out += ` ${qualified(p, a.local)}="${escapeAttr(a.value)}"`;
-  }
-  if (children.length === 0) return `${out}/>`;
-  out += ">";
+  const [out, inScope] = startTag(prefix, local, bindings, attrs, scope);
+  const inline = isRichParagraph(el2) ? decodeInline(readUnits(el2.get("inline"))) : [];
+  if (children.length === 0 && inline.length === 0) return `${out}/>`;
+  let body = "";
   for (const child of children) {
-    out += child instanceof Y3.Text ? escapeText(child.toString()) : serializeLive(child, inScope);
+    body += child instanceof Y.Text ? escapeText(child.toString()) : serializeLive(child, inScope);
   }
-  return `${out}</${qualified(prefix, local)}>`;
+  for (const child of inline) body += serializeXml(child, inScope);
+  return `${out}>${body}</${qualified(prefix, local)}>`;
 }
 
 // src/encoding.ts
-var COLLAB_FORMAT = "arbi-docx/1";
+var COLLAB_FORMAT = "arbi-docx/2";
+var READABLE_FORMATS = /* @__PURE__ */ new Set(["arbi-docx/1", COLLAB_FORMAT]);
+function isReadableFormat(format) {
+  return format !== void 0 && READABLE_FORMATS.has(format);
+}
 function isText(node) {
   return node.kind === "textValue";
 }
@@ -1017,7 +1101,7 @@ function canonicalToXml(node) {
   return xml;
 }
 function encodeElement(el2) {
-  return xmlToLive(canonicalToXml(el2));
+  return xmlToLive(canonicalToXml(el2), /* @__PURE__ */ new Map(), true);
 }
 function bootstrap(doc, pkg) {
   doc.transact(() => {
@@ -1035,7 +1119,7 @@ function bootstrap(doc, pkg) {
     }
     const rels = doc.getMap("rels");
     for (const [owner, records] of pkg.relationships) {
-      const byId = new Y3.Map();
+      const byId = new Y.Map();
       for (const r of records) {
         byId.set(r.id, {
           ownerPart: r.ownerPart,
@@ -1051,7 +1135,7 @@ function bootstrap(doc, pkg) {
     for (const e of pkg.externalTargets) {
       let byId = rels.get(e.ownerPart);
       if (!byId) {
-        byId = new Y3.Map();
+        byId = new Y.Map();
         rels.set(e.ownerPart, byId);
       }
       byId.set(e.id, {
@@ -1371,7 +1455,7 @@ var NodeRegistry = class {
   require(id) {
     let entry = this.entries.get(id) ?? this.resolveInsideParagraph(id);
     if (!entry) throw new RegistryError(`journal names unknown node ${id}`);
-    if ("live" in entry && entry.live instanceof Y3.Map && isRichParagraph(entry.live)) {
+    if ("live" in entry && entry.live instanceof Y.Map && isCompact(entry.live)) {
       this.openParagraph(entry.live);
       entry = this.entries.get(id);
     }
@@ -1389,7 +1473,7 @@ var NodeRegistry = class {
     for (let length = path.length - 1; length >= 1; length--) {
       const ancestor = this.entries.get(id.slice(0, hash + 1) + path.slice(0, length).join("."));
       if (!ancestor) continue;
-      if ("live" in ancestor && ancestor.live instanceof Y3.Map && isRichParagraph(ancestor.live)) {
+      if ("live" in ancestor && ancestor.live instanceof Y.Map && isCompact(ancestor.live)) {
         this.openParagraph(ancestor.live);
         return this.entries.get(id);
       }
@@ -1421,13 +1505,13 @@ var NodeRegistry = class {
   /**
    * Walk a mirror root and register every node under its positional id, `${part}#0` for the root and
    * `${parent}.${index}` below it. This is the id scheme core assigns when it reads a part. A rich
-   * paragraph is registered as one node; its inner nodes appear when it is opened.
+   * paragraph or a packed element is registered as one node; its inner nodes appear when it is opened.
    */
   registerTree(partName, root) {
     const walk = (node, id) => {
       this.registerLive(id, node);
-      if (node instanceof Y3.Text) return;
-      if (isRichParagraph(node)) return;
+      if (node instanceof Y.Text) return;
+      if (isCompact(node)) return;
       childrenOf(node).forEach((child, index) => walk(child, `${id}.${index}`));
     };
     walk(root, `${partName}#0`);
@@ -1484,7 +1568,7 @@ var NodeRegistry = class {
     for (const child of children) this.own(child, owner);
     if (owner) this.dirty.add(owner);
   }
-  /** Write every changed open paragraph back into the mirror. Call at the end of a journal. */
+  /** Write every changed open paragraph or packed element back into the mirror. Call at the end of a journal. */
   flushRich() {
     for (const live of [...this.dirty]) {
       this.dirty.delete(live);
@@ -1495,6 +1579,11 @@ var NodeRegistry = class {
   writeBack(record) {
     const { live, root } = record;
     const xml = plainToXml(root);
+    if (isPackedElement(live)) {
+      if (packable(xml)) repack(live, xml);
+      else this.degrade(record);
+      return;
+    }
     const encoded = encodeParagraph(xml.children);
     if (!encoded) {
       this.degrade(record);
@@ -1511,21 +1600,22 @@ var NodeRegistry = class {
       bindings.push(xml.bindings.map((b) => ({ ...b })));
     }
     const head = childrenOf(live);
-    const stored = head.toArray().map((child) => liveToXml(child));
-    if (JSON.stringify(stored) !== JSON.stringify(encoded.head)) {
+    const scope = scopeWithin(live);
+    const stored = head.toArray().map((child) => serializeLive(child, scope)).join("");
+    if (stored !== encoded.head.map((el2) => serializeXml(el2, scope)).join("")) {
       head.delete(0, head.length);
-      head.push(encoded.head.map((el2) => xmlToLive(el2)));
+      head.push(encoded.head.map((el2) => xmlToLive(el2, scope)));
     }
     const inline = live.get("inline");
     applyUnits(inline, readUnits(inline), encoded.units);
   }
-  /** The paragraph can no longer be held as rich text: store it as plain elements instead. */
+  /** The paragraph can no longer be held as rich text, or the element packed: store it as a tree. */
   degrade(record) {
     const parent = record.live.parent;
-    if (!(parent instanceof Y3.Array))
+    if (!(parent instanceof Y.Array))
       throw new RegistryError("a paragraph outside a parent cannot change form");
     const index = parent.toArray().indexOf(record.live);
-    const generic = this.toGenericLive(record.root);
+    const generic = this.toGenericLive(record.root, scopeOf(record.live));
     this.open.delete(record.live);
     parent.delete(index, 1);
     parent.insert(index, [generic]);
@@ -1540,8 +1630,8 @@ var NodeRegistry = class {
   snapshotLive(node) {
     const id = this.liveIds.get(node);
     if (id === void 0) throw new RegistryError("live node has no registered id");
-    if (node instanceof Y3.Text) return { type: "text", id, value: node.toString() };
-    if (isRichParagraph(node)) {
+    if (node instanceof Y.Text) return { type: "text", id, value: node.toString() };
+    if (isCompact(node)) {
       return this.open.get(node)?.root ?? xmlToPlain(liveToXml(node), id);
     }
     const prefix = node.get("prefix");
@@ -1569,8 +1659,8 @@ var NodeRegistry = class {
     if (id !== void 0 && this.isCurrentLive(id, node)) {
       this.entries.set(id, { plain });
     }
-    if (node instanceof Y3.Text || plain.type === "text") return;
-    if (isRichParagraph(node)) {
+    if (node instanceof Y.Text || plain.type === "text") return;
+    if (isCompact(node)) {
       this.open.delete(node);
       this.dirty.delete(node);
       return;
@@ -1578,53 +1668,61 @@ var NodeRegistry = class {
     const liveChildren = childrenOf(node).toArray();
     liveChildren.forEach((child, index) => this.detachInto(child, plain.children[index]));
   }
-  /** Build Yjs types for a plain subtree and register every node as live. */
-  toLive(plain) {
+  /**
+   * Build Yjs types for a plain subtree placed where `scope` is in force, and register every node as
+   * live. A rich paragraph or packed element stays open on the plain tree, which is already current.
+   * A part's `root` is never packed.
+   */
+  toLive(plain, scope = /* @__PURE__ */ new Map(), root = false) {
     if (plain.type === "text") {
-      const text = new Y3.Text();
+      const text = new Y.Text();
       text.insert(0, plain.value);
       this.registerLive(plain.id, text);
       return text;
     }
+    const xml = plainToXml(plain);
+    let map;
     if (isParagraphEl(plain)) {
-      const xml = plainToXml(plain);
       const encoded = encodeParagraph(xml.children);
-      if (encoded) {
-        const map = createRichParagraph(xml, encoded);
-        this.liveIds.set(map, plain.id);
-        this.registerPlain(plain);
-        this.own(plain, map);
-        this.open.set(map, { live: map, root: plain, id: plain.id });
-        return map;
-      }
+      if (encoded) map = createRichParagraph(xml, encoded, scope);
+    }
+    if (!map && !root && packable(xml)) map = xmlToLive(xml, scope);
+    if (map) {
+      this.liveIds.set(map, plain.id);
+      this.registerPlain(plain);
+      this.own(plain, map);
+      this.open.set(map, { live: map, root: plain, id: plain.id });
+      return map;
     }
-    return this.toGenericLive(plain);
+    return this.toGenericLive(plain, scope);
   }
-  toGenericLive(plain) {
+  toGenericLive(plain, scope) {
     const map = xmlToGenericShell(plain);
-    const children = new Y3.Array();
-    children.push(plain.children.map((child) => this.toLive(child)));
+    const inner = withBindings(scope, plain.bindings);
+    const children = new Y.Array();
+    children.push(plain.children.map((child) => this.toLive(child, inner)));
     map.set("children", children);
     this.registerLive(plain.id, map);
     return map;
   }
   /**
-   * A live node that can be inserted into a parent. Anything not yet attached is built fresh; an
-   * attached node is copied, because a Yjs type cannot have two parents.
+   * A live node that can be inserted into a parent (`scope` is in force there), or a part's `root`.
+   * Anything not yet attached is built fresh; an attached node is copied, because a Yjs type cannot
+   * have two parents.
    */
-  attachable(id) {
-    return this.toLive(this.snapshot(id));
+  attachable(id, scope = /* @__PURE__ */ new Map(), root = false) {
+    return this.toLive(this.snapshot(id), scope, root);
   }
 };
 function xmlToGenericShell(plain) {
-  const map = new Y3.Map();
+  const map = new Y.Map();
   map.set("ns", plain.ns);
   map.set("local", plain.local);
   if (plain.prefix !== void 0) map.set("prefix", plain.prefix);
-  const attrs = new Y3.Array();
+  const attrs = new Y.Array();
   attrs.push(plain.attrs.map((a) => ({ ...a })));
   map.set("attrs", attrs);
-  const bindings = new Y3.Array();
+  const bindings = new Y.Array();
   bindings.push(plain.bindings.map((b) => ({ ...b })));
   map.set("bindings", bindings);
   return map;
@@ -1689,7 +1787,7 @@ function setNamespaceBinding(registry, id, prefix, uri) {
   }
 }
 function asLiveElement(node, id) {
-  if (node instanceof Y3.Text) throw new JournalError(`${id} is a text node, not an element`);
+  if (node instanceof Y.Text) throw new JournalError(`${id} is a text node, not an element`);
   return node;
 }
 function asPlainElement(node, id) {
@@ -1705,7 +1803,7 @@ function spliceText(registry, id, start, deleteCount, insert) {
     return;
   }
   const text = entry.live;
-  if (!(text instanceof Y3.Text)) throw new JournalError(`${id} is not a text node`);
+  if (!(text instanceof Y.Text)) throw new JournalError(`${id} is not a text node`);
   if (start < 0 || start + deleteCount > text.length) {
     throw new JournalError(`text splice out of range on ${id}`);
   }
@@ -1718,27 +1816,29 @@ function detachRemoved(registry, parent, start, count) {
 function spliceChildren(registry, parentId, start, deleteCount, childIds) {
   const parentEntry = registry.require(parentId);
   if ("plain" in parentEntry) {
-    const parent = asPlainElement(parentEntry.plain, parentId);
-    if (start < 0 || start + deleteCount > parent.children.length) {
+    const parent2 = asPlainElement(parentEntry.plain, parentId);
+    if (start < 0 || start + deleteCount > parent2.children.length) {
       throw new JournalError(`child splice out of range on ${parentId}`);
     }
     const inserted2 = childIds.map((id) => registry.snapshot(id));
-    parent.children.splice(start, deleteCount, ...inserted2);
-    registry.adopt(parent, inserted2);
+    parent2.children.splice(start, deleteCount, ...inserted2);
+    registry.adopt(parent2, inserted2);
     return;
   }
-  const children = childrenOf(asLiveElement(parentEntry.live, parentId));
+  const parent = asLiveElement(parentEntry.live, parentId);
+  const children = childrenOf(parent);
   if (start < 0 || start + deleteCount > children.length) {
     throw new JournalError(`child splice out of range on ${parentId}`);
   }
   detachRemoved(registry, children, start, deleteCount);
-  const inserted = childIds.map((id) => registry.attachable(id));
+  const scope = scopeWithin(parent);
+  const inserted = childIds.map((id) => registry.attachable(id, scope));
   if (deleteCount > 0) children.delete(start, deleteCount);
   if (inserted.length > 0) children.insert(start, inserted);
 }
 function locate(registry, id, node) {
   const children = node.parent;
-  if (!(children instanceof Y3.Array)) throw new JournalError(`${id} is not attached`);
+  if (!(children instanceof Y.Array)) throw new JournalError(`${id} is not attached`);
   const index = children.toArray().indexOf(node);
   if (index < 0) throw new JournalError(`${id} is not in its parent`);
   return { children, index };
@@ -1765,8 +1865,10 @@ function moveNode(registry, id, destinationId, destinationIndex) {
     registry.adopt(destination2, [copy]);
     return;
   }
-  const destination = childrenOf(asLiveElement(destinationEntry.live, destinationId));
-  destination.insert(destinationIndex, [registry.toLive(copy)]);
+  const destination = asLiveElement(destinationEntry.live, destinationId);
+  childrenOf(destination).insert(destinationIndex, [
+    registry.toLive(copy, scopeWithin(destination))
+  ]);
 }
 function renameNode(registry, id, qname) {
   const entry = registry.require(id);
@@ -1781,7 +1883,7 @@ function renameNode(registry, id, qname) {
     return true;
   }
   const live = entry.live;
-  if (live instanceof Y3.Text || isRichParagraph(live)) return false;
+  if (live instanceof Y.Text || isCompact(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) {
@@ -1811,7 +1913,7 @@ function putNode(registry, effect) {
 }
 function rootFor(registry, id) {
   const entry = registry.require(id);
-  const live = "live" in entry && entry.live.parent === null ? entry.live : registry.attachable(id);
+  const live = "live" in entry && entry.live.parent === null ? entry.live : registry.attachable(id, /* @__PURE__ */ new Map(), true);
   return asLiveElement(live, id);
 }
 function applyEffect(doc, registry, effect, context) {
@@ -1855,7 +1957,7 @@ function applyEffect(doc, registry, effect, context) {
       const rels = doc.getMap("rels");
       let byId = rels.get(effect.owner);
       if (!byId) {
-        byId = new Y3.Map();
+        byId = new Y.Map();
         rels.set(effect.owner, byId);
       }
       byId.set(effect.record.id, { ...effect.record });
@@ -2060,7 +2162,7 @@ var DocxCollaborationSession = class {
     this.doc = options.doc;
     this.awareness = options.awareness;
     this.offlineEditing = options.offlineEditing ?? false;
-    this.undoManager = new Y3.UndoManager(
+    this.undoManager = new Y.UndoManager(
       [
         this.doc.getMap("parts"),
         this.doc.getMap("rels"),
@@ -2100,7 +2202,7 @@ var DocxCollaborationSession = class {
       this.setStatus("error", "not-initialized");
       return;
     }
-    if (readFormat(this.doc) !== COLLAB_FORMAT) {
+    if (!isReadableFormat(readFormat(this.doc))) {
       this.setStatus("error", "collaboration-format-mismatch", readFormat(this.doc));
       return;
     }
@@ -2374,7 +2476,7 @@ function resolveAddress(port, address) {
   };
 }
 function vectorKey(doc) {
-  return Array.from(Y3.encodeStateVector(doc)).join(",");
+  return Array.from(Y.encodeStateVector(doc)).join(",");
 }
 function randomToken() {
   if (typeof crypto.randomUUID === "function") return crypto.randomUUID();
@@ -2407,7 +2509,7 @@ function assertCompatibleVersions(versions) {
 function assertRoomFormat(doc) {
   if (!isBootstrapped(doc)) throw new CollaborationCompatibilityError("The room holds no document.");
   const format = readFormat(doc);
-  if (format !== COLLAB_FORMAT) {
+  if (!isReadableFormat(format)) {
     throw new CollaborationCompatibilityError(`Unsupported room format ${String(format)}.`);
   }
 }