@portone/docx-editor 0.1.1 → 0.2.1

package/dist/docx/comments/writing.js

@@ -1,20 +1,30 @@
 // src/docx/comments/writing.ts
+import { elementXml, xmlnsAttr } from "../../ooxml/element.js";
 import { DocxExportError } from "../../ooxml/errors.js";
-import { decodeUtf8, encodeUtf8, escapeXml, W_NS } from "../../ooxml/xml.js";
+import { wName, xmlnsDecl } from "../../ooxml/names.js";
+import { encodeUtf8 } from "../../ooxml/xml.js";
 import { directoryOf } from "../relationships.js";
 import {
   COMMENTS_CONTENT_TYPE,
   COMMENTS_EXTENDED_CONTENT_TYPE,
   COMMENTS_EXTENDED_REL_TYPE,
   COMMENTS_REL_TYPE,
-  CONTENT_TYPES_PATH,
-  MC_NS,
-  W14_NS,
-  W15_NS
+  CONTENT_TYPES_PATH
 } from "./constants.js";
+import { withContentType } from "./contentTypes.js";
+import {
+  arrivedEntries,
+  renderCommentBody,
+  renderCommentExtension,
+  withThreadKey
+} from "./grammar.js";
 import {
   commentReferencesIn
 } from "./model.js";
+import { planPeoplePart } from "./people.js";
+function needsThreadKey(id, comment, session) {
+  return comment.imported && carriesThreadMetadata(comment) && (session.comments.byId.get(id)?.paraId ?? null) === null;
+}
 function commentsChanged(doc, session) {
   const current = commentReferencesIn(doc);
   if (current.size !== session.commentReferenceIds.size) return true;
@@ -34,14 +44,11 @@ function commentsChanged(doc, session) {
   for (const comment of current.values()) {
     if (comment.replies.some((reply) => !reply.imported)) return true;
   }
+  for (const [id, comment] of current) {
+    if (needsThreadKey(id, comment, session)) return true;
+  }
   return false;
 }
-function renderedExtension(comment) {
-  if (comment.extensionXml !== null) return comment.extensionXml;
-  const parent = "parentParaId" in comment ? ` w15:paraIdParent="${escapeXml(comment.parentParaId)}"` : "";
-  const done = "resolved" in comment ? ` w15:done="${comment.resolved ? "1" : "0"}"` : "";
-  return `<w15:commentEx w15:paraId="${escapeXml(comment.paraId)}"${parent}${done}/>`;
-}
 function extensionsXml(references, comments, originallyReferenced) {
   const current = currentCommentBodies(references);
   const originalThreads = originalThreadIds(comments, originallyReferenced);
@@ -56,19 +63,23 @@ function extensionsXml(references, comments, originallyReferenced) {
     const id = idByParaId.get(original.paraId);
     const item = id === void 0 ? void 0 : current.get(id);
     if (id !== void 0 && item && !written.has(id)) {
-      pieces.push(renderedExtension(item));
+      pieces.push(renderCommentExtension(item));
       written.add(id);
     } else if (id === void 0 || !originalThreads.has(id)) {
       pieces.push(original.xml);
     }
   }
   for (const [id, comment] of current) {
-    if (!written.has(id)) pieces.push(renderedExtension(comment));
+    if (!written.has(id) && carriesThreadMetadata(comment)) {
+      pieces.push(renderCommentExtension(comment));
+    }
   }
   if (comments.extendedXml === null) {
-    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w15:commentsEx xmlns:w15="${W15_NS}">${pieces.join("")}</w15:commentsEx>`;
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w15:commentsEx ${xmlnsDecl("w15")}>${pieces.join("")}</w15:commentsEx>`;
   }
-  const open = /<(?:[\w.-]+:)?commentsEx\b[^>]*>/.exec(comments.extendedXml);
+  const open = /<(?:[^\s<>/:="']+:)?commentsEx\b[^>]*>/.exec(
+    comments.extendedXml
+  );
   if (!open) {
     throw new DocxExportError(
       "malformed-xml",
@@ -76,14 +87,23 @@ function extensionsXml(references, comments, originallyReferenced) {
     );
   }
   const name = /^<([^\s>]+)/.exec(open[0])?.[1];
-  const close = name ? comments.extendedXml.lastIndexOf(`</${name}>`) : -1;
+  if (name === void 0) {
+    throw new DocxExportError(
+      "malformed-xml",
+      "the Comments Extended part has no commentsEx root element"
+    );
+  }
+  const bodyAt = open.index + open[0].length;
+  if (open[0].endsWith("/>")) {
+    return comments.extendedXml.slice(0, open.index) + `${open[0].slice(0, -2)}>${pieces.join("")}</${name}>` + comments.extendedXml.slice(bodyAt);
+  }
+  const close = comments.extendedXml.lastIndexOf(`</${name}>`);
   if (close === -1) {
     throw new DocxExportError(
       "malformed-xml",
       "the Comments Extended part has no closing commentsEx tag"
     );
   }
-  const bodyAt = open.index + open[0].length;
   return comments.extendedXml.slice(0, bodyAt) + pieces.join("") + comments.extendedXml.slice(close);
 }
 function extensionsChanged(doc, session) {
@@ -101,41 +121,42 @@ function extensionsChanged(doc, session) {
   }
   return false;
 }
-function commentTextXml(text) {
-  const lines = text.split("\n");
-  const pieces = [];
-  lines.forEach((line, index) => {
-    if (index > 0) pieces.push("<w:br/>");
-    if (line.length > 0 || lines.length === 1) {
-      pieces.push(`<w:t xml:space="preserve">${escapeXml(line)}</w:t>`);
-    }
-  });
-  return `<w:r>${pieces.join("")}</w:r>`;
-}
 function carriesThreadMetadata(comment) {
   return comment.extensionXml !== null || "threadImported" in comment && !comment.threadImported || "parentParaId" in comment;
 }
-function renderedComment(comment) {
+function keyedEntry(comment, arrivedKeyed) {
+  return carriesThreadMetadata(comment) || arrivedKeyed.has(comment.id);
+}
+function renderedComment(comment, arrivedKeyed, arrived) {
   if (comment.imported && comment.commentXml !== null) {
-    return comment.commentXml;
+    return carriesThreadMetadata(comment) ? withThreadKey(
+      comment.commentXml,
+      comment.paraId,
+      arrived.get(comment.id) ?? null
+    ) : comment.commentXml;
   }
   const attrs = [
-    `w:id="${escapeXml(comment.id)}"`,
-    comment.author === null ? null : `w:author="${escapeXml(comment.author)}"`,
-    comment.date === null ? null : `w:date="${escapeXml(comment.date)}"`,
-    comment.initials === null ? null : `w:initials="${escapeXml(comment.initials)}"`
-  ].filter((entry) => entry !== null).join(" ");
-  const threaded = carriesThreadMetadata(comment);
-  const paragraphAttrs = threaded ? ` xmlns:w14="${W14_NS}" w14:paraId="${escapeXml(comment.paraId)}"` : "";
-  return `<w:comment xmlns:w="${W_NS}" ${attrs}><w:p${paragraphAttrs}>${commentTextXml(comment.text)}</w:p></w:comment>`;
+    xmlnsAttr("w"),
+    [wName("id"), comment.id],
+    comment.author === null ? null : [wName("author"), comment.author],
+    comment.date === null ? null : [wName("date"), comment.date],
+    comment.initials === null ? null : [wName("initials"), comment.initials]
+  ];
+  const paraId = keyedEntry(comment, arrivedKeyed) ? comment.paraId : null;
+  const body = renderCommentBody(comment.text, paraId);
+  return elementXml(
+    wName("comment"),
+    attrs.filter((attr) => attr !== null),
+    [body]
+  );
 }
 function withThreadMarkupCompatibility(openTag) {
   let updated = openTag;
   if (!/\sxmlns:w14\s*=/.test(updated)) {
-    updated = updated.replace(/>$/, ` xmlns:w14="${W14_NS}">`);
+    updated = updated.replace(/>$/, ` ${xmlnsDecl("w14")}>`);
   }
   if (!/\sxmlns:mc\s*=/.test(updated)) {
-    updated = updated.replace(/>$/, ` xmlns:mc="${MC_NS}">`);
+    updated = updated.replace(/>$/, ` ${xmlnsDecl("mc")}>`);
   }
   const ignorable = /\smc:Ignorable\s*=\s*(["'])([^"']*)\1/.exec(updated);
   if (!ignorable) {
@@ -170,16 +191,22 @@ function originalThreadIds(comments, rootIds) {
 }
 function commentsXml(references, comments, originallyReferenced) {
   const currentBodies = currentCommentBodies(references);
+  const arrivedKeyed = new Set(
+    Array.from(comments.byId.values()).flatMap(
+      (entry) => entry.paraId === null ? [] : [entry.id]
+    )
+  );
   const hasThreadMetadata = Array.from(currentBodies.values()).some(
-    carriesThreadMetadata
+    (comment) => keyedEntry(comment, arrivedKeyed)
   );
+  const arrived = arrivedEntries(comments.xml);
   const originalThreads = originalThreadIds(comments, originallyReferenced);
   const pieces = [];
   const written = /* @__PURE__ */ new Set();
   for (const original of comments.ordered) {
     const current = currentBodies.get(original.id);
     if (current) {
-      pieces.push(renderedComment(current));
+      pieces.push(renderedComment(current, arrivedKeyed, arrived));
       written.add(original.id);
       continue;
     }
@@ -189,13 +216,15 @@ function commentsXml(references, comments, originallyReferenced) {
     }
   }
   for (const [id, comment] of currentBodies) {
-    if (!written.has(id)) pieces.push(renderedComment(comment));
+    if (!written.has(id)) {
+      pieces.push(renderedComment(comment, arrivedKeyed, arrived));
+    }
   }
   if (comments.xml === null) {
-    const compatibility = hasThreadMetadata ? ` xmlns:w14="${W14_NS}" xmlns:mc="${MC_NS}" mc:Ignorable="w14"` : "";
-    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:comments xmlns:w="${W_NS}"${compatibility}>${pieces.join("")}</w:comments>`;
+    const compatibility = hasThreadMetadata ? ` ${xmlnsDecl("w14")} ${xmlnsDecl("mc")} mc:Ignorable="w14"` : "";
+    return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:comments ${xmlnsDecl("w")}${compatibility}>${pieces.join("")}</w:comments>`;
   }
-  const open = /<(?:[\w.-]+:)?comments\b[^>]*>/.exec(comments.xml);
+  const open = /<(?:[^\s<>/:="']+:)?comments\b[^>]*>/.exec(comments.xml);
   if (!open) {
     throw new DocxExportError(
       "malformed-xml",
@@ -213,37 +242,6 @@ function commentsXml(references, comments, originallyReferenced) {
   const openTag = hasThreadMetadata ? withThreadMarkupCompatibility(open[0]) : open[0];
   return comments.xml.slice(0, open.index) + openTag + pieces.join("") + comments.xml.slice(close);
 }
-var TYPES_OPEN_TAG = /<(?:[\w.-]+:)?Types\b[^>]*>/;
-function withContentType(parts, partPath, contentType, current) {
-  const original = current ?? parts.get(CONTENT_TYPES_PATH);
-  if (!original) {
-    throw new DocxExportError(
-      "missing-content-types",
-      `cannot add a Comments part to a package that has no ${CONTENT_TYPES_PATH}`
-    );
-  }
-  const { text, hadBom } = decodeUtf8(original);
-  const partName = `/${partPath}`;
-  if (new RegExp(
-    `<(?:[\\w.-]+:)?Override[^>]+PartName=["']${partName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']`,
-    "i"
-  ).test(text)) {
-    return null;
-  }
-  const open = TYPES_OPEN_TAG.exec(text);
-  if (!open) {
-    throw new DocxExportError(
-      "malformed-xml",
-      `${CONTENT_TYPES_PATH} has no Types element`
-    );
-  }
-  const rootName = /^<([^\s>]+)/.exec(open[0])?.[1] ?? "Types";
-  const separator = rootName.indexOf(":");
-  const prefix = separator < 0 ? "" : `${rootName.slice(0, separator)}:`;
-  const declaration = `<${prefix}Override PartName="${partName}" ContentType="${contentType}"/>`;
-  const at = open.index + open[0].length;
-  return encodeUtf8(text.slice(0, at) + declaration + text.slice(at), hadBom);
-}
 function availableCommentsPath(session) {
   const directory = directoryOf(session.mainPartPath);
   for (let suffix = 0; ; suffix += 1) {
@@ -320,6 +318,15 @@ function planCommentParts(doc, session, relationships, currentContentTypes) {
       if (contentTypes) parts.set(CONTENT_TYPES_PATH, contentTypes);
     }
   }
+  if (bodyChanged) {
+    const people = planPeoplePart(
+      currentCommentBodies(references).values(),
+      session,
+      relationships,
+      parts.get(CONTENT_TYPES_PATH) ?? currentContentTypes
+    );
+    for (const [path, bytes] of people ?? []) parts.set(path, bytes);
+  }
   return { parts };
 }
 export {

package/dist/docx/exportDocx.js

@@ -4,6 +4,7 @@ import { parseNumbering } from "../numbering/parseNumbering.js";
 import { addListDefinitions } from "../numbering/writeNumbering.js";
 import { DocxExportError } from "../ooxml/errors.js";
 import { decodeUtf8, encodeUtf8, parseXml, W_NS } from "../ooxml/xml.js";
+import { sameSource } from "../schema/sourceEquality.js";
 import { planCommentParts } from "./comments.js";
 import { repackParts } from "./container.js";
 import { hyperlinkRefs } from "./hyperlink.js";
@@ -21,7 +22,7 @@ import {
 import { withUniqueControls } from "./uniqueControls.js";
 function blockXml(node, session, refs) {
   const imported = originalBlock(node, session);
-  if (imported && node.eq(imported.node)) return imported.xml;
+  if (imported && sameSource(node, imported.node)) return imported.xml;
   return serializeBlock(node, session, refs);
 }
 function buildDocumentXml(doc, session, refs) {

package/dist/docx/formatting/direct.js

@@ -3,6 +3,7 @@ import {
   isHighlightName,
   isUnderlineKind
 } from "../../model/format.js";
+import { overridingAttrs } from "../../ooxml/precedence.js";
 import { readTabStopDirectives } from "../../ooxml/tabStops.js";
 import {
   ALIGN_BY_JC,
@@ -18,11 +19,7 @@ import {
   wAttr
 } from "../../ooxml/units.js";
 import { childByLocalName } from "../../ooxml/xml.js";
-import {
-  NO_THEME_FONTS,
-  THEME_ATTRS,
-  themeFontName
-} from "../theme.js";
+import { NO_THEME_FONTS, themeFontName } from "../theme.js";
 var VERTICAL_ALIGN_BY_VAL = {
   superscript: "superscript",
   subscript: "subscript"
@@ -35,7 +32,7 @@ var FONT_SLOTS = ["ascii", "eastAsia", "hAnsi", "cs"];
 function slotFontName(rFonts, slot, themeFonts) {
   const written = wAttr(rFonts, slot);
   if (written !== null) return written;
-  for (const attr of THEME_ATTRS[slot] ?? []) {
+  for (const attr of overridingAttrs("rFonts", slot)) {
     const resolved = themeFontName(themeFonts, wAttr(rFonts, attr));
     if (resolved !== null) return resolved;
   }

package/dist/docx/headersFooters.js

@@ -1,6 +1,7 @@
 // src/docx/headersFooters.ts
 import { ALIGN_BY_JC } from "../ooxml/units.js";
 import {
+  attributeByLocalName,
   decodeUtf8,
   elementChildren,
   parseXml,
@@ -20,12 +21,9 @@ var NO_HEADERS_FOOTERS = {
   evenAndOdd: false,
   pageNumberStart: 1
 };
-function attribute(el, localName) {
-  return Array.from(el.attributes).find((entry) => entry.localName === localName)?.value ?? null;
-}
 function isOn(el) {
   if (!el) return false;
-  const value = attribute(el, "val")?.toLowerCase();
+  const value = attributeByLocalName(el, "val")?.toLowerCase();
   return value !== "0" && value !== "false" && value !== "off";
 }
 function firstSectPrIn(root) {
@@ -58,13 +56,13 @@ function paragraphSegments(paragraph) {
       return;
     }
     if (el.namespaceURI === W_NS && el.localName === "fldSimple") {
-      const field = pageField(attribute(el, "instr") ?? "");
+      const field = pageField(attributeByLocalName(el, "instr") ?? "");
       if (field) dynamic(field);
       else for (const child of elementChildren(el)) visit(child);
       return;
     }
     if (el.namespaceURI === W_NS && el.localName === "fldChar") {
-      const kind = attribute(el, "fldCharType");
+      const kind = attributeByLocalName(el, "fldCharType");
       if (kind === "begin") {
         fields.push({ instruction: "", separated: false, field: null });
       } else if (kind === "separate") {
@@ -129,7 +127,7 @@ function readContent(bytes) {
   ) : void 0;
   return {
     segments,
-    align: jc ? ALIGN_BY_JC[attribute(jc, "val") ?? ""] ?? null : null
+    align: jc ? ALIGN_BY_JC[attributeByLocalName(jc, "val") ?? ""] ?? null : null
   };
 }
 function settingsEvenAndOdd(parts, mainPartPath) {
@@ -153,9 +151,9 @@ function readVariants(parts, mainPartPath, sectPr, kind) {
   const variants = { ...EMPTY_VARIANTS };
   for (const reference of elementChildren(sectPr)) {
     if (reference.localName !== `${kind}Reference`) continue;
-    const type = attribute(reference, "type") ?? "default";
+    const type = attributeByLocalName(reference, "type") ?? "default";
     if (type !== "default" && type !== "first" && type !== "even") continue;
-    const id = reference.getAttributeNS(R_NS, "id") ?? attribute(reference, "id");
+    const id = reference.getAttributeNS(R_NS, "id") ?? attributeByLocalName(reference, "id");
     if (!id) continue;
     const relationship = relationships.get(id);
     if (!relationship || relationship.external || relationship.type !== `${R_NS}/${kind}`) {
@@ -170,7 +168,7 @@ function pageNumberStart(sectPr) {
   const pgNumType = elementChildren(sectPr).find(
     (child) => child.localName === "pgNumType"
   );
-  const declared = pgNumType ? attribute(pgNumType, "start") : null;
+  const declared = pgNumType ? attributeByLocalName(pgNumType, "start") : null;
   if (declared === null) return 1;
   const start = Number(declared);
   return Number.isSafeInteger(start) && start >= 0 ? start : 1;

package/dist/docx/importParagraph.js

@@ -81,6 +81,7 @@ function buildRunChild(el, marks, images, comments, notes, noteLabel) {
             id,
             referenceXml: serializeXml(el),
             author: comment?.author ?? null,
+            authorId: comment?.authorId ?? null,
             initials: comment?.initials ?? null,
             date: comment?.date ?? null,
             text: comment?.text ?? "",

package/dist/docx/notes.js

@@ -1,5 +1,6 @@
 // src/docx/notes.ts
 import {
+  attributeByLocalName,
   decodeUtf8,
   elementChildren,
   parseXml,
@@ -16,9 +17,6 @@ var NO_NOTES = {
   footnotes: EMPTY_PART,
   endnotes: EMPTY_PART
 };
-function attribute(el, localName) {
-  return Array.from(el.attributes).find((entry) => entry.localName === localName)?.value ?? null;
-}
 function inlineText(node) {
   if (node.localName === "t") return node.textContent ?? "";
   if (node.localName === "tab") return "	";
@@ -42,9 +40,9 @@ function notePart(parts, mainPartPath, kind) {
   const root = parseXml(decodeUtf8(bytes).text).documentElement;
   const elements = elementChildren(root).filter((el) => el.localName === kind);
   const ordered = elements.flatMap((el) => {
-    const id = attribute(el, "id");
+    const id = attributeByLocalName(el, "id");
     if (id === null) return [];
-    const type = attribute(el, "type");
+    const type = attributeByLocalName(el, "type");
     const regular = type === null || type === "normal";
     const label = regular ? "?" : "";
     return [{ kind, id, label, text: noteText(el), type }];

package/dist/docx/paraProps.js

@@ -1,5 +1,12 @@
 // src/docx/paraProps.ts
-import { childByLocalName, escapeXml, localPart } from "../ooxml/xml.js";
+import {
+  attrPairs,
+  elementXml,
+  withoutAttrs
+} from "../ooxml/element.js";
+import { wName } from "../ooxml/names.js";
+import { setAttr } from "../ooxml/precedence.js";
+import { childByLocalName, localPart } from "../ooxml/xml.js";
 import {
   layerParagraphFormat,
   layerRunFormat,
@@ -33,65 +40,66 @@ function readParagraphStyleRun(pPr, styles = NO_STYLES, defaultStyleId = null) {
 }
 function numPrXml(ref) {
   if (!ref) return null;
-  return `<w:numPr><w:ilvl w:val="${ref.ilvl}"/><w:numId w:val="${ref.numId}"/></w:numPr>`;
-}
-function keptIndAttrs(ind, dropped) {
-  if (!ind) return [];
-  return Array.from(ind.attributes).filter((attr) => !dropped.includes(localPart(attr.name))).map((attr) => [attr.name, attr.value]);
+  return elementXml(
+    wName("numPr"),
+    [],
+    [
+      elementXml(wName("ilvl"), [[wName("val"), `${ref.ilvl}`]]),
+      elementXml(wName("numId"), [[wName("val"), `${ref.numId}`]])
+    ]
+  );
 }
 function levelIndAttrs(indent) {
   const attrs = [];
   if (indent.startTwips !== null)
-    attrs.push(["w:left", `${indent.startTwips}`]);
+    attrs.push([wName("left"), `${indent.startTwips}`]);
   if (indent.hangingTwips !== null) {
-    attrs.push(["w:hanging", `${indent.hangingTwips}`]);
+    attrs.push([wName("hanging"), `${indent.hangingTwips}`]);
   } else if (indent.firstLineTwips !== null) {
-    attrs.push(["w:firstLine", `${indent.firstLineTwips}`]);
+    attrs.push([wName("firstLine"), `${indent.firstLineTwips}`]);
   }
   return attrs;
 }
-function attrsXml(tag, attrs) {
-  if (attrs.length === 0) return null;
-  const text = attrs.map(([name, value]) => `${name}="${escapeXml(value)}"`).join(" ");
-  return `<${tag} ${text}/>`;
-}
 function indXml(attrs) {
-  return attrsXml("w:ind", attrs);
+  return attrs.length === 0 ? null : elementXml(wName("ind"), attrs);
 }
 function nextIndXml(ind, change) {
   if (change.kind === "keep") return void 0;
   if (change.kind === "clearHanging") {
-    return indXml(keptIndAttrs(ind, HANGING_IND_ATTRS));
+    return indXml(withoutAttrs(attrPairs(ind), HANGING_IND_ATTRS));
   }
   const dropped = [...LEFT_IND_ATTRS, ...FIRST_LINE_IND_ATTRS];
   return indXml([
     ...levelIndAttrs(change.indent),
-    ...keptIndAttrs(ind, dropped)
+    ...withoutAttrs(attrPairs(ind), dropped)
   ]);
 }
 function leftIndAttrs(ind, leftTwips) {
-  const original = ind ? Array.from(ind.attributes) : [];
+  const original = attrPairs(ind);
   const slot = original.find(
-    (attr) => LEFT_TWIPS_IND_ATTRS.includes(localPart(attr.name))
-  )?.name;
-  const moved = original.flatMap((attr) => {
-    if (!LEFT_IND_ATTRS.includes(localPart(attr.name))) {
-      return [[attr.name, attr.value]];
-    }
-    return attr.name === slot && leftTwips > 0 ? [[attr.name, `${leftTwips}`]] : [];
-  });
-  return slot === void 0 && leftTwips > 0 ? [["w:left", `${leftTwips}`], ...moved] : moved;
+    ([name]) => LEFT_TWIPS_IND_ATTRS.includes(localPart(name))
+  )?.[0];
+  const written = leftTwips > 0 ? `${leftTwips}` : null;
+  const kept = withoutAttrs(
+    original,
+    LEFT_IND_ATTRS.filter(
+      (name) => slot === void 0 || name !== localPart(slot)
+    )
+  );
+  if (slot !== void 0) return setAttr(kept, "ind", localPart(slot), written);
+  return written === null ? kept : [[wName("left"), written], ...kept];
 }
 var EMPTY_P_PR = { tag: "w:pPr", attrs: null, children: [] };
 function editParagraphProps(pPr, styles, defaultStyleId, plan) {
   const props = pPr === null ? EMPTY_P_PR : parseProps(pPr);
   const element = pPr === null ? null : parsePropsXml(pPr);
   if (!props || pPr !== null && !element) return null;
-  const children = plan(element).reduce(
-    (kept, [name, xml]) => setPropsChild(kept, name, xml, P_PR_ORDER),
-    props.children
+  const rendered = renderProps(
+    plan(element).reduce(
+      (kept, [name, xml]) => setPropsChild(kept, name, xml, P_PR_ORDER),
+      props
+    )
   );
-  const rendered = renderProps({ ...props, children });
   const next = rendered === "" ? null : rendered;
   return {
     pPr: next,
@@ -116,19 +124,16 @@ function withLeftIndent(pPr, leftTwips, styles = NO_STYLES, defaultStyleId = nul
   });
 }
 function spacingAttrs(spacing, edits) {
-  const original = spacing ? Array.from(spacing.attributes) : [];
-  const editOf = (name) => edits.find(([edited]) => edited === localPart(name));
-  const changed = original.map((attr) => [
-    attr.name,
-    editOf(attr.name)?.[1] ?? attr.value
-  ]);
-  const added = edits.filter(
-    ([name]) => !original.some((attr) => localPart(attr.name) === name)
+  const changed = attrPairs(spacing).map(
+    ([name, value]) => [
+      name,
+      edits.find(([edited]) => edited === localPart(name))?.[1] ?? value
+    ]
+  );
+  return edits.reduce(
+    (attrs, [name, value]) => setAttr(attrs, "spacing", name, value),
+    changed
   );
-  return [
-    ...changed,
-    ...added.map(([name, value]) => [`w:${name}`, value])
-  ];
 }
 function withLineSpacing(pPr, spacing, styles = NO_STYLES, defaultStyleId = null) {
   const line = spacing.rule === "auto" ? Math.round(spacing.lines * 240) : Math.round(spacing.pt * 20);
@@ -138,11 +143,11 @@ function withLineSpacing(pPr, spacing, styles = NO_STYLES, defaultStyleId = null
       ["line", `${line}`],
       ["lineRule", spacing.rule]
     ]);
-    return [["spacing", attrsXml("w:spacing", attrs)]];
+    return [["spacing", elementXml(wName("spacing"), attrs)]];
   });
 }
 function withParagraphStyle(pPr, styleId, styles = NO_STYLES, defaultStyleId = null) {
-  const pStyle = styleId === null ? null : `<w:pStyle w:val="${escapeXml(styleId)}"/>`;
+  const pStyle = styleId === null ? null : elementXml(wName("pStyle"), [[wName("val"), styleId]]);
   return editParagraphProps(pPr, styles, defaultStyleId, () => [
     ["pStyle", pStyle]
   ]);
@@ -154,7 +159,7 @@ var JC_BY_ALIGN = {
   justify: "both"
 };
 function withParagraphAlign(pPr, align, styles = NO_STYLES, defaultStyleId = null) {
-  const jc = `<w:jc w:val="${JC_BY_ALIGN[align]}"/>`;
+  const jc = elementXml(wName("jc"), [[wName("val"), JC_BY_ALIGN[align]]]);
   return editParagraphProps(pPr, styles, defaultStyleId, () => [["jc", jc]]);
 }
 export {

package/dist/docx/propsXml.d.ts

@@ -10,12 +10,20 @@ export interface PropsChild {
     name: string;
     /** This child's original XML fragment exactly as it was */
     xml: string;
+    /**
+     * Whatever stood between the child before this one and this one: line breaks a producer laid
+     * out, comments, anything that is not an element. Carried so that rewriting one child does not
+     * quietly drop the rest of what the fragment said. Absent rather than empty when nothing did.
+     */
+    before?: string;
 }
 export interface Props {
     /** The opening tag name exactly as written (e.g. `w:tcPr`) */
     tag: string;
     attrs: string | null;
     children: PropsChild[];
+    /** The same, for what stood between the last child and the closing tag */
+    tail?: string;
 }
 /** The order the children are laid out in under `w:rPr` (CT_RPr) */
 export declare const RUN_PR_ORDER: readonly string[];
@@ -27,18 +35,28 @@ export declare const TC_PR_ORDER: readonly string[];
 export declare const TR_PR_ORDER: readonly string[];
 /** The order the children are laid out in under `w:tblPr` (CT_TblPr) */
 export declare const TBL_PR_ORDER: readonly string[];
+/**
+ * What stood inside a single element, and "" for one that stood empty or cannot be made out.
+ *
+ * The opening tag is read rather than scanned for, so a `>` inside an attribute value does not
+ * pass for the end of it.
+ */
+export declare function innerXml(xml: string): string;
 /**
  * Splits a formatting fragment into its opening tag and its list of children.
  * null if its shape cannot be made out (in which case leaving the original untouched is the safe move).
  */
 export declare function parseProps(xml: string): Props | null;
-/** With no children at all, the formatting fragment itself is not written */
+/**
+ * With nothing to say, the formatting fragment itself is not written. A fragment holding only
+ * whitespace says nothing; one holding a comment does, so it is written back.
+ */
 export declare function renderProps(props: Props): string;
 /**
  * Replaces a single child with new XML.
  * A null `xml` removes that child. A child that was not there goes into the spot the order calls for.
  */
-export declare function setPropsChild(children: PropsChild[], name: string, xml: string | null, order: readonly string[]): PropsChild[];
+export declare function setPropsChild(props: Props, name: string, xml: string | null, order: readonly string[]): Props;
 export declare function propsChild(children: PropsChild[], name: string): PropsChild | undefined;
 /**
  * Reads a single formatting fragment into an element.