@portone/docx-editor 0.4.0 → 0.5.1

package/dist/schema/docxSchema.js

@@ -1,5 +1,7 @@
 // src/schema/docxSchema.ts
-import { Schema } from "prosemirror-model";
+import {
+  Schema
+} from "prosemirror-model";
 import {
   spanCount,
   toBandSizes,
@@ -17,6 +19,7 @@ import {
 } from "../model/format.js";
 import {
   ANY_ELEMENT,
+  ANY_ELEMENTS,
   ATTRIBUTES,
   acceptRawXml,
   ELEMENT
@@ -32,7 +35,9 @@ import {
   tableStyle
 } from "../styles/inlineStyle.js";
 import { imageNodeSpec, runMarkSpec } from "./rendering.js";
+import { WRAPPER_ATTRS, WRAPPER_GROUP } from "./wrappers.js";
 import { imageNodeSpec as imageNodeSpec2, runMarkSpec as runMarkSpec2 } from "./rendering.js";
+var NO_STORIES = Object.freeze({});
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
@@ -78,7 +83,7 @@ function repliesHoldTheirXml(value) {
   const replies = value;
   return replies.every((reply) => {
     if (!isRecord(reply)) return true;
-    return acceptRawXml(ELEMENT("comment"), text(reply.commentXml) ?? null) !== false && acceptRawXml(ANY_ELEMENT, text(reply.extensionXml) ?? null) !== false;
+    return acceptRawXml(ANY_ELEMENT, text(reply.extensionXml) ?? null) !== false;
   });
 }
 var SDT_PREFIX = {
@@ -96,22 +101,65 @@ var LINK_PREFIX = {
 function rawXml(dom, attribute, shape) {
   return acceptRawXml(shape, dom.getAttribute(attribute));
 }
+function preservedDisplayOf(value) {
+  switch (value) {
+    case "text":
+      return "text";
+    case "break":
+      return "break";
+    case "chip":
+      return "chip";
+    default:
+      return "hidden";
+  }
+}
+function preservedAttributes(node, className) {
+  return {
+    class: className,
+    "data-xml": text(node.attrs.xml),
+    "data-element": text(node.attrs.element),
+    "data-display": preservedDisplayOf(node.attrs.display),
+    "data-text": text(node.attrs.text),
+    "data-guarded": node.attrs.guarded === true ? "1" : void 0
+  };
+}
+function preservedDom(node, className) {
+  const attributes = preservedAttributes(node, className);
+  const display = preservedDisplayOf(node.attrs.display);
+  const preview = text(node.attrs.text);
+  const element = text(node.attrs.element);
+  if (display === "break") return ["span", attributes, ["br"]];
+  if (display === "text") return ["span", attributes, preview ?? ""];
+  if (display === "chip") {
+    return [
+      "span",
+      { ...attributes, title: element ?? UNKNOWN_PLACEHOLDER },
+      preview !== void 0 && preview !== "" ? preview : element ?? "?"
+    ];
+  }
+  return ["span", attributes];
+}
+function preservedAttrs(dom) {
+  const xml = rawXml(dom, "data-xml", ANY_ELEMENT);
+  if (xml === false) return false;
+  return {
+    xml,
+    element: dom.getAttribute("data-element"),
+    display: preservedDisplayOf(dom.getAttribute("data-display")),
+    text: dom.getAttribute("data-text"),
+    guarded: dom.getAttribute("data-guarded") === "1"
+  };
+}
 var TABLE_PLACEHOLDER = "Table (unsupported layout, original is preserved)";
 var UNKNOWN_PLACEHOLDER = "Unsupported content (not editable, original is preserved)";
 var TABLE_NAMES = ["w:tbl", "tbl"];
-function rawBlockDom(name) {
-  if (name !== void 0 && TABLE_NAMES.includes(name)) {
-    return {
-      className: editorClassNames.tablePlaceholder,
-      label: TABLE_PLACEHOLDER
-    };
-  }
-  return { className: editorClassNames.rawBlock, label: UNKNOWN_PLACEHOLDER };
+function placeholderLabel(name) {
+  return name !== void 0 && TABLE_NAMES.includes(name) ? TABLE_PLACEHOLDER : UNKNOWN_PLACEHOLDER;
+}
+function preservedNameOf(dom) {
+  const name = dom.getAttribute("data-name");
+  return name === null || name === "" ? null : name;
 }
-var DOCX_RAW_SELECTOR = [
-  editorClassNames.rawBlock,
-  editorClassNames.tablePlaceholder
-].map((className) => `div[data-src].${className}`).join(", ");
 var docxSchema = new Schema({
   nodes: {
     doc: {
@@ -121,7 +169,20 @@ var docxSchema = new Schema({
          * The definitions of the lists started while editing, which the export writes into
          * numbering.xml. Read back through `numbering/listRegistry`.
          */
-        newLists: { default: null }
+        newLists: { default: null },
+        /**
+         * The section properties that close the body: the paper the document's last section is
+         * written on, its headers and its page numbering (§17.6.18). Held as the fragment the
+         * document wrote, so an untouched document goes back out as the bytes it arrived as.
+         * Read through `docx/sections`.
+         */
+        sectPr: { default: null },
+        /**
+         * What each side story - a comment's body, a footnote's - currently says, under the key
+         * naming it (`./stories`). Read and written through `docx/story`; it never reaches the
+         * DOM, so a copy out of the editor carries none of it.
+         */
+        stories: { default: NO_STORIES }
       }
     },
     paragraph: {
@@ -221,7 +282,13 @@ var docxSchema = new Schema({
          */
         styleConditions: { default: null },
         /** How many rows and columns one band of the table style is made of */
-        styleBands: { default: null }
+        styleBands: { default: null },
+        /**
+         * The markers that stood between this table's rows: the ones ahead of the first row
+         * (`docx/importTable`). They are invisible and belong to no row, so they ride along on
+         * the table and go back where they stood
+         */
+        leadingXml: { default: null }
       },
       toDOM(node) {
         const format = toTableFormat(node.attrs.format);
@@ -246,7 +313,8 @@ var docxSchema = new Schema({
           "data-style-conditions": formatJson(
             toTableStyleConditions(node.attrs.styleConditions)
           ),
-          "data-style-bands": formatJson(toBandSizes(node.attrs.styleBands))
+          "data-style-bands": formatJson(toBandSizes(node.attrs.styleBands)),
+          "data-leading": text(node.attrs.leadingXml)
         };
         const body = ["tbody", 0];
         if (gridCols.length === 0) return ["table", attrs, body];
@@ -269,7 +337,8 @@ var docxSchema = new Schema({
               "data-gridchange",
               ELEMENT("tblGridChange")
             );
-            if (tblAttrs === false || tblPr === false || gridChange === false) {
+            const leadingXml = rawXml(dom, "data-leading", ANY_ELEMENTS);
+            if (tblAttrs === false || tblPr === false || gridChange === false || leadingXml === false) {
               return false;
             }
             return {
@@ -291,7 +360,8 @@ var docxSchema = new Schema({
               ),
               styleBands: toBandSizes(
                 parseJson(dom.getAttribute("data-style-bands"))
-              )
+              ),
+              leadingXml
             };
           }
         }
@@ -307,7 +377,11 @@ var docxSchema = new Schema({
         tblPrEx: { default: null },
         /** The whole `<w:trPr>...</w:trPr>` XML */
         trPr: { default: null },
-        format: { default: null }
+        format: { default: null },
+        /** The markers that stood ahead of this row's first cell (`docx/importTable`) */
+        leadingXml: { default: null },
+        /** The markers that stood between this row and the next one, under the table */
+        trailingXml: { default: null }
       },
       toDOM(node) {
         const format = toRowFormat(node.attrs.format);
@@ -319,7 +393,9 @@ var docxSchema = new Schema({
             "data-trattrs": text(node.attrs.trAttrs),
             "data-tblprex": text(node.attrs.tblPrEx),
             "data-trpr": text(node.attrs.trPr),
-            "data-fmt": formatJson(format)
+            "data-fmt": formatJson(format),
+            "data-leading": text(node.attrs.leadingXml),
+            "data-trailing": text(node.attrs.trailingXml)
           },
           0
         ];
@@ -331,14 +407,18 @@ var docxSchema = new Schema({
             const trAttrs = rawXml(dom, "data-trattrs", ATTRIBUTES);
             const tblPrEx = rawXml(dom, "data-tblprex", ELEMENT("tblPrEx"));
             const trPr = rawXml(dom, "data-trpr", ELEMENT("trPr"));
-            if (trAttrs === false || tblPrEx === false || trPr === false) {
+            const leadingXml = rawXml(dom, "data-leading", ANY_ELEMENTS);
+            const trailingXml = rawXml(dom, "data-trailing", ANY_ELEMENTS);
+            if (trAttrs === false || tblPrEx === false || trPr === false || leadingXml === false || trailingXml === false) {
               return false;
             }
             return {
               trAttrs,
               tblPrEx,
               trPr,
-              format: toRowFormat(parseJson(dom.getAttribute("data-fmt")))
+              format: toRowFormat(parseJson(dom.getAttribute("data-fmt"))),
+              leadingXml,
+              trailingXml
             };
           }
         }
@@ -372,7 +452,9 @@ var docxSchema = new Schema({
          * the lock lives inside that very XML.
          */
         sdtContentsLocked: { default: false },
-        sdtDeletionLocked: { default: false }
+        sdtDeletionLocked: { default: false },
+        /** The markers that stood between this cell and the next one, under the row */
+        trailingXml: { default: null }
       },
       toDOM(node) {
         const format = toCellFormat(node.attrs.format);
@@ -394,7 +476,8 @@ var docxSchema = new Schema({
             "data-fmt": formatJson(format),
             "data-sdt-prefix": text(node.attrs.sdtPrefix),
             "data-sdt-contents-locked": locked ? "1" : void 0,
-            "data-sdt-deletion-locked": node.attrs.sdtDeletionLocked === true ? "1" : void 0
+            "data-sdt-deletion-locked": node.attrs.sdtDeletionLocked === true ? "1" : void 0,
+            "data-trailing": text(node.attrs.trailingXml)
           },
           0
         ];
@@ -406,7 +489,8 @@ var docxSchema = new Schema({
             const tcAttrs = rawXml(dom, "data-tcattrs", ATTRIBUTES);
             const tcPr = rawXml(dom, "data-tcpr", ELEMENT("tcPr"));
             const sdtPrefix = rawXml(dom, "data-sdt-prefix", SDT_PREFIX);
-            if (tcAttrs === false || tcPr === false || sdtPrefix === false) {
+            const trailingXml = rawXml(dom, "data-trailing", ANY_ELEMENTS);
+            if (tcAttrs === false || tcPr === false || sdtPrefix === false || trailingXml === false) {
               return false;
             }
             return {
@@ -421,116 +505,75 @@ var docxSchema = new Schema({
               format: toCellFormat(parseJson(dom.getAttribute("data-fmt"))),
               sdtPrefix,
               sdtContentsLocked: dom.getAttribute("data-sdt-contents-locked") === "1",
-              sdtDeletionLocked: dom.getAttribute("data-sdt-deletion-locked") === "1"
+              sdtDeletionLocked: dom.getAttribute("data-sdt-deletion-locked") === "1",
+              trailingXml
             };
           }
         }
       ]
     },
     /**
-     * The node that carries, as original XML, a block inside a table cell that we do
-     * not model (a nested table, for instance).
-     * Unlike a body block it has no original fragment number, so it carries its own
-     * XML around with it.
+     * The one node a block the editor has no model for stands as, wherever it stood: under the
+     * body, or inside a table cell.
+     *
+     * Which of the two it came from is what it carries the original as. A body block is one of the
+     * fragments the session holds, so it names that fragment and the bytes go back out untouched;
+     * a block inside a cell was never a fragment of its own, so it carries its XML with it.
+     *
+     * `display` says whether anything of it is on screen. A range marker draws nothing - it stands
+     * between blocks and marks a spot rather than holding content - while a table nobody could take
+     * apart draws a box saying so.
      */
     rawBlock: {
       group: "block preserved",
       atom: true,
       selectable: false,
       attrs: {
+        /** The element, verbatim, for a block the session holds no fragment of */
         xml: { default: null },
+        /** The fragment of the session this block was opened from */
+        srcId: { default: null },
         /** The original element name (for example `w:tbl`) */
-        name: { default: null }
+        name: { default: null },
+        display: { default: "chip" },
+        /** Whether the deletion guard answers for this block (`./preservedGuards`) */
+        guarded: { default: false }
       },
       toDOM(node) {
-        return [
-          "div",
-          {
-            class: `${editorClassNames.rawBlock} ${editorClassNames.rawXmlBlock}`,
-            "data-xml": text(node.attrs.xml),
-            "data-name": text(node.attrs.name)
-          },
-          UNKNOWN_PLACEHOLDER
-        ];
+        const name = text(node.attrs.name);
+        const display = preservedDisplayOf(node.attrs.display);
+        const attributes = {
+          class: editorClassNames.rawBlock,
+          "data-xml": text(node.attrs.xml),
+          "data-src": text(node.attrs.srcId) ?? "",
+          "data-name": name ?? "",
+          "data-display": display,
+          "data-guarded": node.attrs.guarded === true ? "1" : void 0
+        };
+        if (display !== "chip") return ["div", attributes];
+        return ["div", attributes, placeholderLabel(name)];
       },
       parseDOM: [
         {
-          tag: `div.${editorClassNames.rawXmlBlock}`,
+          tag: `div.${editorClassNames.rawBlock}[data-name]`,
           getAttrs: (dom) => {
             const xml = rawXml(dom, "data-xml", ANY_ELEMENT);
             if (xml === false) return false;
-            return { xml, name: dom.getAttribute("data-name") };
-          }
-        }
-      ]
-    },
-    /** The node that carries a non-paragraph body block (a table we could not model, sectPr, an unknown element) exactly as it came */
-    docxRaw: {
-      group: "block preserved",
-      atom: true,
-      selectable: false,
-      attrs: {
-        srcId: { default: null },
-        /** The original element name (for example `w:tbl`) */
-        name: { default: null }
-      },
-      toDOM(node) {
-        const { className, label } = rawBlockDom(text(node.attrs.name));
-        return [
-          "div",
-          {
-            class: className,
-            "data-src": text(node.attrs.srcId) ?? "",
-            "data-name": text(node.attrs.name)
-          },
-          label
-        ];
-      },
-      parseDOM: [
-        {
-          tag: DOCX_RAW_SELECTOR,
-          getAttrs: (dom) => ({
-            srcId: srcIdOf(dom),
-            name: dom.getAttribute("data-name")
-          })
-        }
-      ]
-    },
-    /** A bookmark range marker that occurs directly under w:body rather than inside a paragraph */
-    bookmarkBlock: {
-      group: "block preserved",
-      atom: true,
-      isolating: true,
-      selectable: false,
-      attrs: {
-        srcId: { default: null },
-        name: { default: null }
-      },
-      toDOM(node) {
-        return [
-          "div",
-          {
-            class: editorClassNames.bookmarkBlock,
-            "data-src": text(node.attrs.srcId) ?? "",
-            "data-name": text(node.attrs.name),
-            hidden: "hidden"
+            return {
+              xml,
+              srcId: srcIdOf(dom),
+              name: preservedNameOf(dom),
+              display: preservedDisplayOf(dom.getAttribute("data-display")),
+              guarded: dom.getAttribute("data-guarded") === "1"
+            };
           }
-        ];
-      },
-      parseDOM: [
-        {
-          tag: `div.${editorClassNames.bookmarkBlock}`,
-          getAttrs: (dom) => ({
-            srcId: srcIdOf(dom),
-            name: dom.getAttribute("data-name")
-          })
         }
       ]
     },
     hardBreak: {
       group: "inline",
       inline: true,
-      marks: "run sdt link",
+      marks: "run wrapper",
       attrs: { brAttrs: { default: null } },
       toDOM(node) {
         return [
@@ -563,7 +606,7 @@ var docxSchema = new Schema({
       group: "inline",
       inline: true,
       draggable: true,
-      marks: "run sdt link",
+      marks: "run wrapper",
       attrs: {
         /** The image bytes as a data URL */
         src: { default: null },
@@ -598,7 +641,7 @@ var docxSchema = new Schema({
       inline: true,
       atom: true,
       selectable: false,
-      marks: "sdt link",
+      marks: "wrapper",
       attrs: {
         id: { default: null },
         xml: { default: null }
@@ -630,7 +673,7 @@ var docxSchema = new Schema({
       inline: true,
       atom: true,
       selectable: false,
-      marks: "sdt link",
+      marks: "wrapper",
       attrs: {
         id: { default: null },
         xml: { default: null }
@@ -662,7 +705,7 @@ var docxSchema = new Schema({
       inline: true,
       atom: true,
       selectable: false,
-      marks: "run sdt link",
+      marks: "run wrapper",
       attrs: {
         id: { default: null },
         referenceXml: { default: null },
@@ -672,9 +715,6 @@ var docxSchema = new Schema({
         authorId: { default: null },
         initials: { default: null },
         date: { default: null },
-        text: { default: "" },
-        commentXml: { default: null },
-        imported: { default: false },
         paraId: { default: null },
         resolved: { default: false },
         extensionXml: { default: null },
@@ -693,9 +733,6 @@ var docxSchema = new Schema({
             "data-comment-author-id": text(node.attrs.authorId),
             "data-comment-initials": text(node.attrs.initials),
             "data-comment-date": text(node.attrs.date),
-            "data-comment-text": text(node.attrs.text),
-            "data-comment-xml": text(node.attrs.commentXml),
-            "data-comment-imported": node.attrs.imported === true ? "1" : void 0,
             "data-comment-para-id": text(node.attrs.paraId),
             "data-comment-resolved": node.attrs.resolved === true ? "1" : void 0,
             "data-comment-extension-xml": text(node.attrs.extensionXml),
@@ -713,18 +750,13 @@ var docxSchema = new Schema({
               "data-reference-xml",
               ELEMENT("commentReference")
             );
-            const commentXml = rawXml(
-              dom,
-              "data-comment-xml",
-              ELEMENT("comment")
-            );
             const extensionXml = rawXml(
               dom,
               "data-comment-extension-xml",
               ANY_ELEMENT
             );
             const replies = parseJson(dom.getAttribute("data-comment-replies")) ?? [];
-            if (referenceXml === false || commentXml === false || extensionXml === false || !repliesHoldTheirXml(replies)) {
+            if (referenceXml === false || extensionXml === false || !repliesHoldTheirXml(replies)) {
               return false;
             }
             return {
@@ -734,9 +766,6 @@ var docxSchema = new Schema({
               authorId: dom.getAttribute("data-comment-author-id"),
               initials: dom.getAttribute("data-comment-initials"),
               date: dom.getAttribute("data-comment-date"),
-              text: dom.getAttribute("data-comment-text") ?? "",
-              commentXml,
-              imported: dom.getAttribute("data-comment-imported") === "1",
               paraId: dom.getAttribute("data-comment-para-id"),
               resolved: dom.getAttribute("data-comment-resolved") === "1",
               extensionXml,
@@ -752,19 +781,17 @@ var docxSchema = new Schema({
       inline: true,
       atom: true,
       selectable: false,
-      marks: "run sdt link",
+      marks: "run wrapper",
       attrs: {
         kind: { default: "footnote" },
         id: { default: null },
         label: { default: "?" },
-        text: { default: "" },
         customMarkFollows: { default: false },
         referenceXml: { default: null }
       },
       toDOM(node) {
         const kind = node.attrs.kind === "endnote" ? "Endnote" : "Footnote";
         const label = text(node.attrs.label) ?? "?";
-        const body = text(node.attrs.text) ?? "";
         return [
           "sup",
           {
@@ -772,11 +799,9 @@ var docxSchema = new Schema({
             "data-note-kind": text(node.attrs.kind),
             "data-note-id": text(node.attrs.id),
             "data-note-label": label,
-            "data-note-text": body,
             "data-custom-mark-follows": node.attrs.customMarkFollows === true ? "1" : void 0,
             "data-reference-xml": text(node.attrs.referenceXml),
-            "aria-label": `${kind} ${label}`,
-            title: body
+            "aria-label": `${kind} ${label}`
           },
           node.attrs.customMarkFollows === true ? "" : label
         ];
@@ -795,7 +820,6 @@ var docxSchema = new Schema({
               kind: dom.getAttribute("data-note-kind") === "endnote" ? "endnote" : "footnote",
               id: dom.getAttribute("data-note-id"),
               label: dom.getAttribute("data-note-label") ?? "?",
-              text: dom.getAttribute("data-note-text") ?? "",
               customMarkFollows: dom.getAttribute("data-custom-mark-follows") === "1",
               referenceXml
             };
@@ -803,29 +827,58 @@ var docxSchema = new Schema({
         }
       ]
     },
+    /**
+     * One child of a run the editor has no node for, kept as the XML it came as.
+     *
+     * It wears the run mark, so it is written back inside the same `<w:r>` as the text beside it,
+     * which is where `EG_RunInnerContent` says it may stand.
+     */
+    rawRunContent: {
+      group: "inline",
+      inline: true,
+      atom: true,
+      marks: "run wrapper",
+      attrs: {
+        xml: { default: null },
+        /** The local name of the element, for example `fldChar` */
+        element: { default: null },
+        display: { default: "hidden" },
+        /** What a `text` display draws, and the preview a chip shows */
+        text: { default: null },
+        /** Whether the deletion guard answers for this fragment (`schema/preservedGuards`) */
+        guarded: { default: false }
+      },
+      toDOM(node) {
+        return preservedDom(node, editorClassNames.rawRunContent);
+      },
+      parseDOM: [
+        {
+          tag: `span.${editorClassNames.rawRunContent}`,
+          getAttrs: preservedAttrs
+        }
+      ]
+    },
     /** The node that carries a non-run element inside a paragraph (a bookmark, for instance) exactly as it came */
     rawInline: {
       group: "inline",
       inline: true,
       atom: true,
-      marks: "sdt link",
-      attrs: { xml: { default: null } },
+      marks: "wrapper",
+      attrs: {
+        xml: { default: null },
+        /** The local name of the element; `r` for a run with no content, kept whole */
+        element: { default: null },
+        display: { default: "hidden" },
+        text: { default: null },
+        guarded: { default: false }
+      },
       toDOM(node) {
-        return [
-          "span",
-          {
-            class: editorClassNames.rawInline,
-            "data-xml": text(node.attrs.xml)
-          }
-        ];
+        return preservedDom(node, editorClassNames.rawInline);
       },
       parseDOM: [
         {
           tag: `span.${editorClassNames.rawInline}`,
-          getAttrs: (dom) => {
-            const xml = rawXml(dom, "data-xml", ANY_ELEMENT);
-            return xml === false ? false : { xml };
-          }
+          getAttrs: preservedAttrs
         }
       ]
     },
@@ -837,20 +890,20 @@ var docxSchema = new Schema({
      *
      * It is declared ahead of the run mark on purpose: the mark declared first is drawn
      * outside on screen, so one control can hold the several runs it wrapped in the file.
+     * It is declared ahead of the other wrappers for the same reason, which is what settles
+     * the nesting of two wrappers written at one and the same depth (`./wrappers`).
      */
     sdt: {
+      group: WRAPPER_GROUP,
       // A character typed against either edge of the control belongs outside it
       inclusive: false,
+      // §17.5.2.17 has a control hold a control, so a second one does not replace the first:
+      // which stands inside which is what `depth` says (`./wrappers`)
+      excludes: "",
       attrs: {
         /** The opening XML of the `<w:sdt>`, the same string a wrapped cell carries */
         sdtPrefix: { default: null },
-        /**
-         * Which control this is, counted through the document as it was opened, and never
-         * written back to the file. Two controls whose XML is identical would otherwise wear
-         * the very same mark and their text would run into one. The first control gets 0, so
-         * a control made during editing needs no number of its own.
-         */
-        sdtKey: { default: 0 },
+        ...WRAPPER_ATTRS,
         /**
          * The two clauses of the control's lock: whether its contents may not be edited, and
          * whether the control itself may not be deleted, not even whole. The `w:lock` inside
@@ -869,7 +922,8 @@ var docxSchema = new Schema({
           {
             class: locked ? `${editorClassNames.sdt} ${editorClassNames.sdtLocked}` : editorClassNames.sdt,
             "data-sdt-prefix": text(mark.attrs.sdtPrefix),
-            "data-sdt-key": numberText(mark.attrs.sdtKey),
+            "data-key": numberText(mark.attrs.key),
+            "data-depth": numberText(mark.attrs.depth),
             "data-sdt-contents-locked": locked ? "1" : void 0,
             "data-sdt-deletion-locked": mark.attrs.deletionLocked === true ? "1" : void 0
           },
@@ -884,7 +938,8 @@ var docxSchema = new Schema({
             if (prefix === null || prefix === false) return false;
             return {
               sdtPrefix: prefix,
-              sdtKey: parseInt10(dom.getAttribute("data-sdt-key"), 0),
+              key: parseInt10(dom.getAttribute("data-key"), 0),
+              depth: parseInt10(dom.getAttribute("data-depth"), 0),
               contentsLocked: dom.getAttribute("data-sdt-contents-locked") === "1",
               deletionLocked: dom.getAttribute("data-sdt-deletion-locked") === "1"
             };
@@ -900,10 +955,12 @@ var docxSchema = new Schema({
      * back out inside it (`docx/serializeParagraph`).
      */
     link: {
+      group: WRAPPER_GROUP,
       // A character typed against either edge of a link belongs outside it, and that is also what
       // decides whether a caret counts as standing in one (`editor/commands/linkCommands`)
       inclusive: false,
       attrs: {
+        ...WRAPPER_ATTRS,
         /**
          * The opening XML of the `<w:hyperlink>`, which carries everything about the link we never
          * read: `w:tooltip`, `w:history`, `w:docLocation`, `w:anchor`. null for a link made in the
@@ -915,14 +972,7 @@ var docxSchema = new Schema({
          * a bookmark alone, or one whose relationship leads nowhere we can follow: the wrapper still
          * travels, and no address is offered for it.
          */
-        href: { default: null },
-        /**
-         * Which link this is, counted through the document as it was opened, and never written back
-         * to the file. Two links written exactly alike would otherwise wear the very same mark and
-         * the text they cover would run into one wrapper. The first link gets 0, so a link made
-         * during editing needs no number of its own.
-         */
-        linkKey: { default: 0 }
+        href: { default: null }
       },
       toDOM(mark) {
         return [
@@ -934,7 +984,8 @@ var docxSchema = new Schema({
             // by the link panel instead
             "data-href": text(mark.attrs.href),
             "data-link-prefix": text(mark.attrs.linkPrefix),
-            "data-link-key": numberText(mark.attrs.linkKey)
+            "data-key": numberText(mark.attrs.key),
+            "data-depth": numberText(mark.attrs.depth)
           },
           0
         ];
@@ -950,7 +1001,8 @@ var docxSchema = new Schema({
             return {
               linkPrefix: prefix,
               href,
-              linkKey: parseInt10(dom.getAttribute("data-link-key"), 0)
+              key: parseInt10(dom.getAttribute("data-key"), 0),
+              depth: parseInt10(dom.getAttribute("data-depth"), 0)
             };
           }
         }