@portone/docx-editor 0.2.1 → 0.3.0

package/dist/docx/tableFormatting/editing.js

@@ -1,18 +1,23 @@
 // src/docx/tableFormatting/editing.ts
-import { attrPairs, elementXml } from "../../ooxml/element.js";
+import { elementXml, wAttrValue } from "../../ooxml/element.js";
 import { wName } from "../../ooxml/names.js";
 import { setAttr } from "../../ooxml/precedence.js";
-import { normalizeHex, wAttr } from "../../ooxml/units.js";
-import { childByLocalName } from "../../ooxml/xml.js";
 import {
+  childElement,
+  editChild,
   parseProps,
   parsePropsXml,
   propsChild,
   renderProps,
-  setPropsChild,
-  TC_PR_ORDER,
-  TR_PR_ORDER
-} from "../propsXml.js";
+  setChild,
+  withAttrs
+} from "../../ooxml/props.js";
+import {
+  ST_EighthPointMeasure,
+  ST_TwipsMeasure,
+  TWIPS_PER_PT
+} from "../../ooxml/simpleTypes.js";
+import { normalizeHex } from "../../ooxml/units.js";
 import {
   NO_BORDER_DEFAULTS,
   NO_CELL_MARGINS,
@@ -25,18 +30,6 @@ var ALL_CELL_SIDES = [
   "left",
   "right"
 ];
-var TC_BORDERS_ORDER = [
-  "top",
-  "start",
-  "left",
-  "bottom",
-  "end",
-  "right",
-  "insideH",
-  "insideV",
-  "tl2br",
-  "tr2bl"
-];
 var SIDE_NAMES = {
   top: ["top"],
   bottom: ["bottom"],
@@ -46,22 +39,24 @@ var SIDE_NAMES = {
 var PRESET_BORDER_EIGHTHS = 4;
 var EMPTY_TC_PR = { tag: "w:tcPr", attrs: null, children: [] };
 function drawsLine(side) {
-  if (!side) return false;
-  const val = wAttr(side, "val");
+  if (side.tag === null) return false;
+  const val = wAttrValue(side.attrs, "val");
   return val !== null && val !== "nil" && val !== "none";
 }
 function sideAttrs(name, current, edit, fallback = null) {
   if (edit.kind === "color") {
     if (!drawsLine(current)) {
-      if (current || !fallback || fallback === "none") return null;
+      if (current.tag !== null || fallback === null || fallback.val === "none") {
+        return null;
+      }
       return inheritedBorderAttrs(fallback, edit.hex);
     }
-    return setAttr(attrPairs(current), name, "color", edit.hex ?? "auto");
+    return setAttr(current.attrs, name, "color", edit.hex ?? "auto");
   }
   if (edit.line === "none") {
-    return current ? setAttr(attrPairs(current), name, "val", "none") : [[wName("val"), "none"]];
+    return current.tag !== null ? setAttr(current.attrs, name, "val", "none") : [[wName("val"), "none"]];
   }
-  if (!current) {
+  if (current.tag === null) {
     return [
       [wName("val"), "single"],
       [wName("sz"), `${PRESET_BORDER_EIGHTHS}`],
@@ -70,217 +65,191 @@ function sideAttrs(name, current, edit, fallback = null) {
     ];
   }
   return setAttr(
-    setAttr(attrPairs(current), name, "val", "single"),
+    setAttr(current.attrs, name, "val", "single"),
     name,
     "sz",
     `${PRESET_BORDER_EIGHTHS}`
   );
 }
-var BORDER_VAL_BY_CSS_STYLE = {
-  solid: "single",
-  double: "double",
-  dashed: "dashed",
-  dotted: "dotted"
-};
-function inheritedBorderAttrs(border, hex) {
-  const matched = border.match(
-    /^(\d+(?:\.\d+)?)pt (solid|double|dashed|dotted) (#[0-9a-f]{6})$/i
-  );
-  if (!matched) return null;
-  const [, widthText, style, currentColor] = matched;
-  if (hex !== null && normalizeHex(currentColor) === hex) return null;
-  const eighths = Math.round(Number.parseFloat(widthText) * 8);
-  if (!Number.isSafeInteger(eighths) || eighths <= 0) return null;
+function inheritedBorderAttrs(line, hex) {
+  const current = line.color.kind === "rgb" ? normalizeHex(line.color.hex) : null;
+  if (hex !== null && current === hex) return null;
+  const thickness = ST_EighthPointMeasure.format(line.eighths);
+  if (thickness === null) return null;
   return [
-    [wName("val"), BORDER_VAL_BY_CSS_STYLE[style.toLowerCase()]],
-    [wName("sz"), `${eighths}`],
+    [wName("val"), line.val],
+    [wName("sz"), thickness],
     [wName("space"), "0"],
     [wName("color"), hex ?? "auto"]
   ];
 }
 function sideNames(borders, side) {
   const [primary, alternate] = SIDE_NAMES[side];
-  const usesAlternate = alternate !== void 0 && borders !== null && childByLocalName(borders, primary) === null && childByLocalName(borders, alternate) !== null;
+  const usesAlternate = alternate !== void 0 && propsChild(borders.children, primary) === void 0 && propsChild(borders.children, alternate) !== void 0;
   if (usesAlternate) return { write: alternate, drop: null };
   return { write: primary, drop: alternate ?? null };
 }
-function editedBorders(current, edit, defaults = NO_BORDER_DEFAULTS) {
-  const props = current === null ? { tag: "w:tcBorders", attrs: null, children: [] } : parseProps(current);
-  const borders = current === null ? null : parsePropsXml(current);
-  if (!props || current !== null && !borders) return null;
+function leafElement(tag, attrs) {
+  return withAttrs({ tag, attrs: null, children: [] }, attrs);
+}
+function containerOf(props, name) {
+  const current = propsChild(props.children, name)?.xml;
+  if (current === void 0) {
+    return { tag: wName(name), attrs: null, children: [] };
+  }
+  return parseProps(current);
+}
+function editedBorders(props, edit, defaults) {
+  const borders = containerOf(props, "tcBorders");
+  if (!borders) return null;
   const sides = edit.kind === "line" ? edit.sides : ALL_CELL_SIDES;
-  const edited = sides.reduce((kept, side) => {
+  return sides.reduce((kept, side) => {
+    if (kept === null) return null;
     const { write, drop } = sideNames(borders, side);
-    const currentSide = borders ? childByLocalName(borders, write) : null;
+    const currentSide = childElement(borders, write);
+    if (!currentSide) return null;
     const attrs = sideAttrs(write, currentSide, edit, defaults[side]);
     if (!attrs) return kept;
-    const tag = currentSide?.nodeName ?? wName(write);
-    const written = setPropsChild(
+    const written = editChild(
       kept,
-      write,
-      elementXml(tag, attrs),
-      TC_BORDERS_ORDER
+      ["tcBorders", write],
+      () => leafElement(currentSide.tag ?? wName(write), attrs)
     );
-    return drop === null ? written : setPropsChild(written, drop, null, TC_BORDERS_ORDER);
+    if (written === null || drop === null) return written;
+    return editChild(written, ["tcBorders", drop], () => null);
   }, props);
-  const xml = renderProps(edited);
-  return { xml: xml === "" ? null : xml };
 }
 function hasPattern(shd) {
-  const val = shd ? wAttr(shd, "val") : null;
+  const val = wAttrValue(shd.attrs, "val");
   return val !== null && val !== "clear" && val !== "nil";
 }
 function editedShading(current, fill) {
-  const tag = current?.nodeName ?? wName("shd");
+  const tag = current.tag ?? wName("shd");
   if (fill === null) {
     if (!hasPattern(current)) return null;
-    return elementXml(tag, setAttr(attrPairs(current), "shd", "fill", "auto"));
+    return elementXml(tag, setAttr(current.attrs, "shd", "fill", "auto"));
   }
-  if (!current) {
+  if (current.tag === null) {
     return elementXml(tag, [
       [wName("val"), "clear"],
       [wName("color"), "auto"],
       [wName("fill"), fill]
     ]);
   }
-  const painting = hasPattern(current) ? attrPairs(current) : setAttr(attrPairs(current), "shd", "val", "clear");
+  const painting = hasPattern(current) ? current.attrs : setAttr(current.attrs, "shd", "val", "clear");
   return elementXml(tag, setAttr(painting, "shd", "fill", fill));
 }
-function bordersChange(props, edit, defaults) {
-  const current = propsChild(props.children, "tcBorders")?.xml ?? null;
-  const edited = editedBorders(current, edit, defaults);
-  return edited === null ? null : { name: "tcBorders", xml: edited.xml };
-}
-var TC_MAR_ORDER = [
-  "top",
-  "start",
-  "left",
-  "bottom",
-  "end",
-  "right"
-];
 var MARGIN_SIDE_NAMES = {
   top: ["top"],
   right: ["end", "right"],
   bottom: ["bottom"],
   left: ["start", "left"]
 };
-function paddingChange(props, values) {
-  const current = propsChild(props.children, "tcMar")?.xml ?? null;
-  const margins = current === null ? null : parsePropsXml(current);
-  const parsed = current === null ? { tag: "w:tcMar", attrs: null, children: [] } : parseProps(current);
-  if (!parsed || current !== null && !margins) return null;
-  let edited = parsed;
+function editedPadding(props, values) {
+  const margins = containerOf(props, "tcMar");
+  if (!margins) return null;
+  let edited = props;
   let wrote = false;
   for (const side of ALL_CELL_SIDES) {
     const points = values[side];
     if (points === void 0) continue;
-    const twips = Math.round(points * 20);
-    if (!Number.isFinite(points) || points < 0 || !Number.isSafeInteger(twips)) {
-      return null;
-    }
-    const existing = margins ? MARGIN_SIDE_NAMES[side].map((name2) => childByLocalName(margins, name2)).find((element) => element !== null) ?? null : null;
-    const name = existing?.localName ?? side;
+    if (points < 0) return null;
+    const twips = ST_TwipsMeasure.format(Math.round(points * TWIPS_PER_PT));
+    if (twips === null) return null;
+    const name = MARGIN_SIDE_NAMES[side].find(
+      (spelling) => propsChild(margins.children, spelling) !== void 0
+    ) ?? side;
+    const existing = childElement(margins, name);
+    if (existing === null || edited === null) return null;
     const attrs = setAttr(
-      setAttr(attrPairs(existing), name, "w", `${twips}`),
+      setAttr(existing.attrs, name, "w", twips),
       name,
       "type",
       "dxa"
     );
-    edited = setPropsChild(
+    edited = editChild(
       edited,
-      name,
-      elementXml(existing?.nodeName ?? wName(side), attrs),
-      TC_MAR_ORDER
+      ["tcMar", name],
+      () => leafElement(existing.tag ?? wName(side), attrs)
     );
     wrote = true;
   }
-  if (!wrote) return null;
-  return { name: "tcMar", xml: renderProps(edited) };
+  return wrote ? edited : null;
 }
-function childChange(edit, props, defaults) {
+function editedProps(edit, props, defaults) {
   switch (edit.kind) {
     case "background": {
       const fill = edit.hex === null ? null : normalizeHex(edit.hex);
       if (edit.hex !== null && fill === null) return null;
-      const current = propsChild(props.children, "shd")?.xml ?? null;
-      const shd = current === null ? null : parsePropsXml(current);
-      if (current !== null && !shd) return null;
-      return { name: "shd", xml: editedShading(shd, fill) };
+      const shd = childElement(props, "shd");
+      if (!shd) return null;
+      return setChild(props, "shd", editedShading(shd, fill));
     }
     case "borders":
-      return bordersChange(
+      return editedBorders(
         props,
-        {
-          kind: "line",
-          line: edit.line,
-          sides: edit.sides
-        },
+        { kind: "line", line: edit.line, sides: edit.sides },
         defaults
       );
     case "borderColor": {
       const hex = edit.hex === null ? null : normalizeHex(edit.hex);
       if (edit.hex !== null && hex === null) return null;
-      return bordersChange(props, { kind: "color", hex }, defaults);
+      return editedBorders(props, { kind: "color", hex }, defaults);
     }
     case "verticalAlign": {
-      const current = propsChild(props.children, "vAlign")?.xml ?? null;
-      const element = current === null ? null : parsePropsXml(current);
-      if (current !== null && !element) return null;
-      return {
-        name: "vAlign",
-        xml: elementXml(
-          element?.nodeName ?? wName("vAlign"),
-          setAttr(attrPairs(element), "vAlign", "val", edit.align)
+      const current = childElement(props, "vAlign");
+      if (!current) return null;
+      return setChild(
+        props,
+        "vAlign",
+        elementXml(
+          current.tag ?? wName("vAlign"),
+          setAttr(current.attrs, "vAlign", "val", edit.align)
         )
-      };
+      );
     }
     case "padding":
-      return paddingChange(props, edit.values);
+      return editedPadding(props, edit.values);
   }
 }
 function editCellProps(tcPr, edit, defaults = NO_BORDER_DEFAULTS, margins = NO_CELL_MARGINS) {
   const props = tcPr === null ? EMPTY_TC_PR : parseProps(tcPr);
   if (!props) return null;
-  const change = childChange(edit, props, defaults);
-  if (!change) return null;
-  const rendered = renderProps(
-    setPropsChild(props, change.name, change.xml, TC_PR_ORDER)
-  );
+  const edited = editedProps(edit, props, defaults);
+  if (!edited) return null;
+  const rendered = renderProps(edited);
   const next = rendered === "" ? null : rendered;
   if (next === tcPr) return null;
   return { tcPr: next, format: readCellProps(next, defaults, margins) };
 }
 function drawsOwnCellBorder(tcPr) {
-  const el = tcPr === null ? null : parsePropsXml(tcPr);
-  const borders = el ? childByLocalName(el, "tcBorders") : null;
+  const props = tcPr === null ? null : parseProps(tcPr);
+  const borders = props && containerOf(props, "tcBorders");
   if (!borders) return false;
   return ALL_CELL_SIDES.some(
-    (side) => SIDE_NAMES[side].some((name) => drawsLine(childByLocalName(borders, name)))
+    (side) => SIDE_NAMES[side].some((name) => {
+      const element = childElement(borders, name);
+      return element !== null && drawsLine(element);
+    })
   );
 }
 function editRowHeight(trPr, heightPt) {
-  const twips = Math.round(heightPt * 20);
-  if (!Number.isFinite(heightPt) || heightPt <= 0 || !Number.isSafeInteger(twips)) {
-    return null;
-  }
-  const props = trPr === null ? { tag: "w:trPr", attrs: null, children: [] } : parseProps(trPr);
+  const twips = heightPt > 0 ? ST_TwipsMeasure.format(Math.round(heightPt * TWIPS_PER_PT)) : null;
+  if (twips === null) return null;
+  const props = trPr === null ? { tag: wName("trPr"), attrs: null, children: [] } : parseProps(trPr);
   if (!props) return null;
-  const current = propsChild(props.children, "trHeight")?.xml ?? null;
-  const element = current === null ? null : parsePropsXml(current);
-  if (current !== null && !element) return null;
-  const writtenRule = element ? wAttr(element, "hRule") : null;
-  const attrs = setAttr(attrPairs(element), "trHeight", "val", `${twips}`);
+  const current = childElement(props, "trHeight");
+  if (!current) return null;
+  const writtenRule = wAttrValue(current.attrs, "hRule");
+  const attrs = setAttr(current.attrs, "trHeight", "val", twips);
   const nextAttrs = setAttr(
     attrs,
     "trHeight",
     "hRule",
     writtenRule === "exact" ? "exact" : "atLeast"
   );
-  const child = elementXml(element?.nodeName ?? wName("trHeight"), nextAttrs);
-  const rendered = renderProps(
-    setPropsChild(props, "trHeight", child, TR_PR_ORDER)
-  );
+  const child = elementXml(current.tag ?? wName("trHeight"), nextAttrs);
+  const rendered = renderProps(setChild(props, "trHeight", child));
   if (rendered === trPr) return null;
   const parsed = parsePropsXml(rendered);
   const format = parsed ? readRowFormat(parsed) : null;

package/dist/docx/tableFormatting/reading.d.ts

@@ -3,14 +3,19 @@
  * collapsed-border resolution matches OOXML inheritance without changing exported XML.
  */
 import type { CellFormat, CellMargins, InsideBorders, RowFormat, TableFormat, TableWidth } from "../../model/format";
+import { type BorderLine } from "../../ooxml/units";
 export type { CellMargins, InsideBorders } from "../../model/format";
+/** The parts of a table a table style formats conditionally (`w:tblStylePr/@w:type`, ST_TblStyleOverrideType) */
+export type TableStyleOverrideType = "wholeTable" | "firstRow" | "lastRow" | "firstCol" | "lastCol" | "band1Vert" | "band2Vert" | "band1Horz" | "band2Horz" | "neCell" | "nwCell" | "seCell" | "swCell";
 /**
  * The width written down by `<w:tblW>` or `<w:tcW>`.
  * If we cannot make out what it means it is null, and such a width goes back out unchanged on export.
  *
- * `auto` and `nil` leave the width to the layout, so whatever number stands beside them says nothing.
+ * `auto` and `nil` leave the width to the layout unless the value carries an explicit percentage.
  * A percentage may be written in fiftieths of a percent, as in `w:w="2500"`, or as `w:w="50%"`.
  * Both have to be gathered into the same unit, or the table collapses into a thin strip on screen.
+ * Word lets an explicit `%` override `w:type` (MS-OI29500 §2.1.185(b)); see
+ * spec/notes/simpleTypes.md. A universal measure under `pct` remains unreadable here.
  */
 export declare function readTableWidth(parent: Element | null, name: "tblW" | "tcW"): TableWidth | null;
 /** The sequence of column widths (dxa) set by `<w:tblGrid>`. Revision markup (tblGridChange) is skipped */
@@ -32,12 +37,17 @@ export declare function readCellMarginsOf(parent: Element | null, name: "tblCell
  * their cell padding from.
  */
 export declare function layerCellMargins(style: CellMargins, direct: CellMargins): CellMargins;
-/** The lines a cell falls back on, one per side, already resolved for its spot in the grid */
+/**
+ * The lines a cell falls back on, one per side, already resolved for its spot in the grid.
+ *
+ * They are held as the markup records them rather than as CSS, because a cell that takes one of
+ * them over as a border of its own writes it back into `w:tcBorders`.
+ */
 export interface CellBorderDefaults {
-    top: string | null;
-    bottom: string | null;
-    left: string | null;
-    right: string | null;
+    top: BorderLine | null;
+    bottom: BorderLine | null;
+    left: BorderLine | null;
+    right: BorderLine | null;
 }
 export declare const NO_BORDER_DEFAULTS: CellBorderDefaults;
 /** Which sides of a cell lie on the edge of the table's grid */

package/dist/docx/tableFormatting/reading.js

@@ -1,31 +1,43 @@
 // src/docx/tableFormatting/reading.ts
+import { parsePropsXml } from "../../ooxml/props.js";
+import {
+  ST_MeasurementOrPercent,
+  ST_SignedTwipsMeasure,
+  ST_TwipsMeasure
+} from "../../ooxml/simpleTypes.js";
 import {
   ALIGN_BY_JC,
+  borderLineCss,
+  borderLineOfCss,
   borderSide,
   childValue,
   isOn,
   shadingOf,
-  toNumber,
   twipsToPt,
   wAttr
 } from "../../ooxml/units.js";
 import { childByLocalName } from "../../ooxml/xml.js";
-import { parsePropsXml } from "../propsXml.js";
+var FIFTIETHS_PER_PERCENT = 50;
 function readTableWidth(parent, name) {
   const el = parent ? childByLocalName(parent, name) : null;
   if (!el) return null;
   const type = wAttr(el, "type") ?? "dxa";
+  const width = ST_MeasurementOrPercent.parse(wAttr(el, "w"));
+  if (width?.kind === "percent") {
+    const fiftieths = Math.round(width.value * FIFTIETHS_PER_PERCENT);
+    return Number.isFinite(fiftieths) ? { type: "pct", fiftieths } : null;
+  }
   if (type === "auto") return { type: "auto" };
   if (type === "nil") return { type: "nil" };
-  const raw = wAttr(el, "w");
-  const value = toNumber(raw);
-  if (value === null) return null;
-  if (type === "dxa") return { type: "dxa", twips: value };
+  if (width === null) return null;
+  if (type === "dxa") {
+    return { type: "dxa", twips: width.value };
+  }
   if (type === "pct") {
-    const isPercentText = raw?.endsWith("%") === true;
+    if (width.kind === "twips") return null;
     return {
       type: "pct",
-      fiftieths: isPercentText ? Math.round(value * 50) : value
+      fiftieths: width.value
     };
   }
   return null;
@@ -35,7 +47,7 @@ function readGridCols(tblGrid) {
   const cols = [];
   for (const child of Array.from(tblGrid.children)) {
     if (child.localName !== "gridCol") continue;
-    const w = toNumber(wAttr(child, "w"));
+    const w = ST_TwipsMeasure.parse(wAttr(child, "w"));
     if (w !== null) cols.push(w);
   }
   return cols;
@@ -69,7 +81,7 @@ function marginSide(margins, names) {
     if (!el) continue;
     const type = wAttr(el, "type") ?? "dxa";
     if (type === "nil") return 0;
-    return type === "dxa" ? twipsToPt(wAttr(el, "w")) : null;
+    return type === "dxa" ? twipsToPt(ST_TwipsMeasure.parse(wAttr(el, "w"))) : null;
   }
   return null;
 }
@@ -107,10 +119,18 @@ function gridEdgesOf(rect, grid) {
 }
 function cellBorderDefaults(edges, outer, inside) {
   return {
-    top: edges.top ? outer?.borderTop ?? null : inside.horizontal,
-    bottom: edges.bottom ? outer?.borderBottom ?? null : inside.horizontal,
-    left: edges.left ? outer?.borderLeft ?? null : inside.vertical,
-    right: edges.right ? outer?.borderRight ?? null : inside.vertical
+    top: borderLineOfCss(
+      edges.top ? outer?.borderTop ?? null : inside.horizontal
+    ),
+    bottom: borderLineOfCss(
+      edges.bottom ? outer?.borderBottom ?? null : inside.horizontal
+    ),
+    left: borderLineOfCss(
+      edges.left ? outer?.borderLeft ?? null : inside.vertical
+    ),
+    right: borderLineOfCss(
+      edges.right ? outer?.borderRight ?? null : inside.vertical
+    )
   };
 }
 function tblStyleIdOf(tblPr) {
@@ -133,12 +153,12 @@ function readTableFormat(tblPr) {
   const align = ALIGN_BY_JC[childValue(tblPr, "jc") ?? ""];
   if (align) format.align = align;
   const tblInd = childByLocalName(tblPr, "tblInd");
-  const indentLeftPt = tblInd ? twipsToPt(wAttr(tblInd, "w")) : null;
+  const indentLeftPt = tblInd ? twipsToPt(ST_SignedTwipsMeasure.parse(wAttr(tblInd, "w"))) : null;
   if (indentLeftPt !== null) format.indentLeftPt = indentLeftPt;
   return format;
 }
 function readRowHeight(trHeight) {
-  const pt = twipsToPt(wAttr(trHeight, "val"));
+  const pt = twipsToPt(ST_TwipsMeasure.parse(wAttr(trHeight, "val")));
   if (pt === null || pt <= 0) return null;
   const rule = wAttr(trHeight, "hRule") === "exact" ? "exact" : "atLeast";
   return { rule, pt };
@@ -170,13 +190,13 @@ function readCellPadding(tcPr, margins) {
 function readCellFormat(tcPr, defaults, margins = NO_CELL_MARGINS) {
   const borders = tcPr ? childByLocalName(tcPr, "tcBorders") : null;
   const format = {};
-  const top = borderSide(borders, "top") ?? defaults.top;
+  const top = borderSide(borders, "top") ?? borderLineCss(defaults.top);
   if (top) format.borderTop = top;
-  const bottom = borderSide(borders, "bottom") ?? defaults.bottom;
+  const bottom = borderSide(borders, "bottom") ?? borderLineCss(defaults.bottom);
   if (bottom) format.borderBottom = bottom;
-  const left = borderSide(borders, "left") ?? borderSide(borders, "start") ?? defaults.left;
+  const left = borderSide(borders, "left") ?? borderSide(borders, "start") ?? borderLineCss(defaults.left);
   if (left) format.borderLeft = left;
-  const right = borderSide(borders, "right") ?? borderSide(borders, "end") ?? defaults.right;
+  const right = borderSide(borders, "right") ?? borderSide(borders, "end") ?? borderLineCss(defaults.right);
   if (right) format.borderRight = right;
   if (tcPr) {
     const background = shadingOf(tcPr);

package/dist/docx/tableTemplate.js

@@ -1,9 +1,9 @@
 // src/docx/tableTemplate.ts
 import { elementXml } from "../ooxml/element.js";
 import { wName } from "../ooxml/names.js";
+import { orderedElement, parsePropsXml } from "../ooxml/props.js";
 import { docxSchema } from "../schema/index.js";
 import { A4_PORTRAIT, bodyWidth } from "./pageGeometry.js";
-import { parsePropsXml } from "./propsXml.js";
 import {
   cellBorderDefaults,
   gridEdgesOf,
@@ -35,14 +35,21 @@ function borderXml(side) {
   ]);
 }
 function tablePropsXml(width) {
-  const borders = BORDER_SIDES.map(borderXml).join("");
-  return elementXml(
+  const borders = orderedElement(
+    wName("tblBorders"),
+    [],
+    BORDER_SIDES.map((side) => ({ name: side, xml: borderXml(side) }))
+  );
+  return orderedElement(
     wName("tblPr"),
     [],
     [
-      widthXml("tblW", width),
-      elementXml(wName("tblBorders"), [], [borders]),
-      elementXml(wName("tblLayout"), [[wName("type"), "fixed"]])
+      { name: "tblW", xml: widthXml("tblW", width) },
+      { name: "tblBorders", xml: borders },
+      {
+        name: "tblLayout",
+        xml: elementXml(wName("tblLayout"), [[wName("type"), "fixed"]])
+      }
     ]
   );
 }
@@ -53,7 +60,11 @@ function widthXml(name, width) {
   ]);
 }
 function cellPropsXml(width) {
-  return elementXml(wName("tcPr"), [], [widthXml("tcW", width)]);
+  return orderedElement(
+    wName("tcPr"),
+    [],
+    [{ name: "tcW", xml: widthXml("tcW", width) }]
+  );
 }
 function evenGridCols(cols, total) {
   const base = Math.floor(total / cols);

package/dist/download.d.ts

@@ -6,6 +6,7 @@
  */
 import type { Node as PMNode } from "prosemirror-model";
 import type { DocxEditorHandle } from "./DocxEditor";
+import type { ExportProblem } from "./docx/invariants";
 export declare const DOCX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 export interface DownloadDocxOptions {
     /** The name to save under. The `.docx` suffix may be there or not */
@@ -19,6 +20,9 @@ export type DownloadDocxResult = {
     status: "unavailable";
 } | {
     status: "empty";
+} | {
+    status: "blocked";
+    problems: readonly ExportProblem[];
 };
 /** Settles the end of the name on exactly one `.docx` */
 export declare function withDocxExtension(fileName: string): string;
@@ -48,10 +52,9 @@ export declare function hasExportableContent(doc: PMNode): boolean;
  * Downloads the edited document as a docx file.
  *
  * `unavailable` when the editor is not mounted yet or the document could not be
- * opened, `empty` when there is nothing to export, and `exported` once a file has
- * gone out.
- * If writing the document back is blocked (a new list in a document without
- * numbering.xml, and the like), it is not passed over silently: `DocxExportError`
- * is rethrown as is.
+ * opened, `empty` when there is nothing to export, `blocked` with every reason
+ * when the document cannot be written back (a new list in a document without
+ * numbering.xml, and the like), and `exported` once a file has gone out.
+ * A refusal the check did not foresee is still thrown as `DocxExportError`.
  */
 export declare function downloadDocx(editor: DocxEditorHandle | null | undefined, options: DownloadDocxOptions): DownloadDocxResult;

package/dist/download.js

@@ -29,6 +29,8 @@ function hasExportableContent(doc) {
 function downloadDocx(editor, options) {
   if (!editor) return { status: "unavailable" };
   if (!hasExportableContent(editor.view.state.doc)) return { status: "empty" };
+  const problems = editor.exportProblems();
+  if (problems.length > 0) return { status: "blocked", problems };
   const bytes = editor.exportBytes();
   const fileName = withDocxExtension(options.fileName);
   downloadBlob(createDocxBlob(bytes), fileName);