@forevka/wordcanvas 0.7.1 → 0.7.2

package/dist-node/{chunk-22JHAERT.js → chunk-57L5XMCL.js}

@@ -19,7 +19,7 @@ import {
   rootEl,
   textOf,
   val
-} from "./chunk-6AJJMHKY.js";
+} from "./chunk-KJV7GJ3H.js";
 import {
   strFromU8,
   unzipSync
@@ -30,7 +30,7 @@ import {
   normalizeRuns,
   parseFieldInstruction,
   parseFieldSpec
-} from "./chunk-CDN6WU2P.js";
+} from "./chunk-PIMVQULL.js";
 
 // src/import/docx/units.ts
 var twipsToPx = (tw) => tw / 15;
@@ -102,6 +102,19 @@ function resolveCellBorders(src, pos) {
   if (right) out.right = right;
   return out;
 }
+function cellBordersFromIR(b) {
+  if (!b) return void 0;
+  const out = {};
+  const t = toCellBorder(b.top);
+  if (t) out.top = t;
+  const r = toCellBorder(b.right);
+  if (r) out.right = r;
+  const bot = toCellBorder(b.bottom);
+  if (bot) out.bottom = bot;
+  const l = toCellBorder(b.left);
+  if (l) out.left = l;
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function toCellBorder(raw) {
   if (!raw || raw.val === "nil" || raw.val === "none") return void 0;
   const widthPx = round2(Math.max(0.5, (raw.sizeEighthPt ?? 4) / 6));
@@ -246,13 +259,51 @@ function decodeParaProps(pPr, warnings) {
       if (top !== void 0 && right !== void 0 && bottom !== void 0 && left !== void 0) {
         props.sectionMarginTwips = { top, right, bottom, left };
       }
+      const headerDist = numAttr(pgMar, "w:header");
+      if (headerDist !== void 0) props.sectionHeaderDistTwips = headerDist;
+      const footerDist = numAttr(pgMar, "w:footer");
+      if (footerDist !== void 0) props.sectionFooterDistTwips = footerDist;
     }
     const cols = el(sectPr, "w:cols");
-    const colCount = numAttr(cols, "w:num");
-    if (colCount !== void 0 && colCount > 1) {
-      props.sectionColumns = { count: colCount };
-      const space = numAttr(cols, "w:space");
-      if (space !== void 0) props.sectionColumns.spaceTwips = space;
+    if (cols) {
+      const colEls = els(cols, "w:col");
+      const colCount = numAttr(cols, "w:num") ?? (colEls.length > 1 ? colEls.length : 1);
+      if (colCount > 1) {
+        props.sectionColumns = { count: colCount };
+        const space = numAttr(cols, "w:space");
+        if (space !== void 0) props.sectionColumns.spaceTwips = space;
+        if (attr(cols, "w:sep") === "1" || attr(cols, "w:sep") === "true") props.sectionColumns.sep = true;
+        if (colEls.length === colCount) {
+          const list = colEls.map((cel) => ({
+            wTwips: numAttr(cel, "w:w") ?? 0,
+            spaceTwips: numAttr(cel, "w:space") ?? 0
+          }));
+          if (list.some((c) => c.wTwips > 0)) props.sectionColumns.cols = list;
+        }
+      }
+    }
+    const pgBorders = el(sectPr, "w:pgBorders");
+    if (pgBorders) {
+      const offsetFrom = attr(pgBorders, "w:offsetFrom");
+      const borders = { offsetFrom: offsetFrom === "text" ? "text" : "page" };
+      const edge = (name) => {
+        const e = el(pgBorders, "w:" + name);
+        if (!e) return;
+        const sz = numAttr(e, "w:sz");
+        const space = numAttr(e, "w:space");
+        const color = attr(e, "w:color");
+        borders[name] = {
+          style: attr(e, "w:val") ?? "single",
+          ...sz !== void 0 ? { sz } : {},
+          ...space !== void 0 ? { space } : {},
+          ...color !== void 0 ? { color } : {}
+        };
+      };
+      edge("top");
+      edge("right");
+      edge("bottom");
+      edge("left");
+      if (borders.top || borders.right || borders.bottom || borders.left) props.sectionPgBorders = borders;
     }
     const pgNumStart = numAttr(el(sectPr, "w:pgNumType"), "w:start");
     if (pgNumStart !== void 0) props.sectionPageNumberStart = pgNumStart;
@@ -293,8 +344,13 @@ function parseDocumentXml(xmlText, partName, warnings) {
   walkBlocks(children(body), blocks, ctx);
   const sectPr = el(body, "w:sectPr");
   const section = sectPr ? parseSection(sectPr, warnings) : null;
+  const bgEl = doc ? el(doc, "w:background") : void 0;
+  const bgColor = bgEl ? attr(bgEl, "w:color") : void 0;
+  const pageColorHex = bgColor && bgColor !== "auto" ? bgColor : void 0;
   const fields = ctx.fieldTrack.registry;
-  return Object.keys(fields).length > 0 ? { blocks, section, sdts, fields } : { blocks, section, sdts };
+  const out = Object.keys(fields).length > 0 ? { blocks, section, sdts, fields } : { blocks, section, sdts };
+  if (pageColorHex) out.pageColorHex = pageColorHex;
+  return out;
 }
 function parseHeaderFooterXml(xmlText, partName, warnings, sdts = {}) {
   const nodes = parseXml(xmlText, partName);
@@ -755,6 +811,21 @@ function parseTable(tbl, ctx) {
   if (tblPr) {
     const styleId = val(tblPr, "w:tblStyle");
     if (styleId) table.styleId = styleId;
+    const look = el(tblPr, "w:tblLook");
+    if (look) {
+      const on = (a) => {
+        const v = attr(look, a);
+        return v === "1" || v === "true";
+      };
+      table.look = {
+        firstRow: on("w:firstRow"),
+        lastRow: on("w:lastRow"),
+        firstCol: on("w:firstColumn"),
+        lastCol: on("w:lastColumn"),
+        bandRows: !on("w:noHBand"),
+        bandCols: !on("w:noVBand")
+      };
+    }
     if (el(tblPr, "w:tblBorders")) table.bordersSpecified = true;
     const borders = decodeBorders(el(tblPr, "w:tblBorders"));
     if (borders) table.borders = borders;
@@ -862,13 +933,47 @@ function parseSection(sectPr, warnings) {
   if (el(sectPr, "w:titlePg")) section.titlePg = true;
   const cols = el(sectPr, "w:cols");
   if (cols) {
-    const count = numAttr(cols, "w:num") ?? 1;
+    const colEls = els(cols, "w:col");
+    const count = numAttr(cols, "w:num") ?? (colEls.length > 1 ? colEls.length : 1);
     if (count > 1) {
       section.columns = { count };
       const space = numAttr(cols, "w:space");
       if (space !== void 0) section.columns.spaceTwips = space;
+      if (attr(cols, "w:sep") === "1" || attr(cols, "w:sep") === "true") section.columns.sep = true;
+      if (colEls.length === count) {
+        const list = colEls.map((cel) => ({
+          wTwips: numAttr(cel, "w:w") ?? 0,
+          spaceTwips: numAttr(cel, "w:space") ?? 0
+        }));
+        if (list.some((c) => c.wTwips > 0)) section.columns.cols = list;
+      }
     }
   }
+  const pgBorders = el(sectPr, "w:pgBorders");
+  if (pgBorders) {
+    const offsetFrom = attr(pgBorders, "w:offsetFrom");
+    const borders = {
+      offsetFrom: offsetFrom === "text" ? "text" : "page"
+    };
+    const edge = (name) => {
+      const e = el(pgBorders, "w:" + name);
+      if (!e) return;
+      const sz = numAttr(e, "w:sz");
+      const space = numAttr(e, "w:space");
+      const color = attr(e, "w:color");
+      borders[name] = {
+        style: attr(e, "w:val") ?? "single",
+        ...sz !== void 0 ? { sz } : {},
+        ...space !== void 0 ? { space } : {},
+        ...color !== void 0 ? { color } : {}
+      };
+    };
+    edge("top");
+    edge("right");
+    edge("bottom");
+    edge("left");
+    if (borders.top || borders.right || borders.bottom || borders.left) section.pageBorders = borders;
+  }
   const pgNumStart = numAttr(el(sectPr, "w:pgNumType"), "w:start");
   if (pgNumStart !== void 0) section.pageNumberStart = pgNumStart;
   return section;
@@ -915,6 +1020,42 @@ function parseFootnotesXml(xmlText, partName, warnings, sdts = {}) {
 }
 
 // src/import/docx/mapToModel.ts
+var PAGE_BORDER_STYLES = /* @__PURE__ */ new Set(["single", "double", "dashed", "dotted", "thick", "none"]);
+function irColumnsToModel(c) {
+  const out = { count: c.count, gapPx: round2(twipsToPx(c.spaceTwips ?? 720)) };
+  if (c.sep) out.sep = true;
+  if (c.cols && c.cols.length === c.count) {
+    out.cols = c.cols.map((col) => ({
+      widthPx: round2(twipsToPx(col.wTwips)),
+      spaceAfterPx: round2(twipsToPx(col.spaceTwips))
+    }));
+  }
+  return out;
+}
+function irPageBordersToModel(b) {
+  const edge = (e) => {
+    if (!e) return void 0;
+    const style = PAGE_BORDER_STYLES.has(e.style) ? e.style : "single";
+    const out2 = {
+      style,
+      widthPx: e.sz !== void 0 ? round2(e.sz / 6) : 1,
+      // w:sz is eighth-points
+      color: !e.color || e.color === "auto" ? "#000000" : `#${e.color}`
+    };
+    if (e.space !== void 0) out2.spacePx = round2(e.space * 96 / 72);
+    return out2;
+  };
+  const out = { offsetFrom: b.offsetFrom ?? "page" };
+  const top = edge(b.top);
+  if (top) out.top = top;
+  const right = edge(b.right);
+  if (right) out.right = right;
+  const bottom = edge(b.bottom);
+  if (bottom) out.bottom = bottom;
+  const left = edge(b.left);
+  if (left) out.left = left;
+  return out;
+}
 var NO_LINKS = () => void 0;
 var DEFAULT_CHAR = {
   fontFamily: "Times New Roman, serif",
@@ -993,7 +1134,7 @@ function createMapper(warnings, resolver, sdts = {}, numbering = /* @__PURE__ */
     const sz = props.sectionPgSize;
     return !!sz && !!refPgSize && (sz.w !== refPgSize.w || sz.h !== refPgSize.h);
   };
-  const sectionIsDistinct = (props) => sectionChangesGeometry(props) || !!props.sectionColumns || props.sectionPageNumberStart !== void 0;
+  const sectionIsDistinct = (props) => sectionChangesGeometry(props) || !!props.sectionColumns || props.sectionPageNumberStart !== void 0 || !!props.sectionPgBorders;
   const buildSectionPatch = (props) => {
     const patch = {};
     if (props.sectionPgSize) {
@@ -1003,10 +1144,11 @@ function createMapper(warnings, resolver, sdts = {}, numbering = /* @__PURE__ */
     if (props.sectionMarginTwips) {
       patch.marginPx = marginTwipsToPx(props.sectionMarginTwips);
     }
-    if (props.sectionColumns) {
-      patch.columns = { count: props.sectionColumns.count, gapPx: round2(twipsToPx(props.sectionColumns.spaceTwips ?? 720)) };
-    }
+    if (props.sectionColumns) patch.columns = irColumnsToModel(props.sectionColumns);
     if (props.sectionPageNumberStart !== void 0) patch.pageNumberStart = props.sectionPageNumberStart;
+    if (props.sectionHeaderDistTwips !== void 0) patch.headerDistancePx = round2(twipsToPx(props.sectionHeaderDistTwips));
+    if (props.sectionFooterDistTwips !== void 0) patch.footerDistancePx = round2(twipsToPx(props.sectionFooterDistTwips));
+    if (props.sectionPgBorders) patch.pageBorders = irPageBordersToModel(props.sectionPgBorders);
     return patch;
   };
   const lastParagraphOf = (mapped) => {
@@ -1268,6 +1410,7 @@ function createMapper(warnings, resolver, sdts = {}, numbering = /* @__PURE__ */
       }
     }
     if (fieldId) style.fieldId = fieldId;
+    if (effective.styleId) style.charStyleId = effective.styleId;
     return { text, style };
   }
   function styleCell(p, ir, styled, hasBorderInfo, width, rowCount) {
@@ -1331,6 +1474,8 @@ function createMapper(warnings, resolver, sdts = {}, numbering = /* @__PURE__ */
     for (const row of placedRows) for (const p of row) styleCell(p, ir, styled, hasBorderInfo, width, ir.rows.length);
     const rows = placedRows.map((row) => ({ cells: row.map((p) => p.cell) }));
     const table = { kind: "table", id: id(), revision: 0, rows };
+    if (ir.styleId) table.styleId = ir.styleId;
+    if (ir.look) table.condOverrides = { ...ir.look };
     table.colFractions = columnFractions(ir.colWidthsTwips, width);
     return table;
   }
@@ -1341,19 +1486,23 @@ function createMapper(warnings, resolver, sdts = {}, numbering = /* @__PURE__ */
       pageHeightPx: ir.pageHeightTwips !== void 0 ? round2(twipsToPx(ir.pageHeightTwips)) : DEFAULT_SECTION.pageHeightPx,
       marginPx: ir.marginTwips ? marginTwipsToPx(ir.marginTwips) : { ...DEFAULT_SECTION.marginPx }
     };
-    if (ir.columns) {
-      section.columns = { count: ir.columns.count, gapPx: round2(twipsToPx(ir.columns.spaceTwips ?? 720)) };
-    }
+    if (ir.columns) section.columns = irColumnsToModel(ir.columns);
     if (ir.pageNumberStart !== void 0) section.pageNumberStart = ir.pageNumberStart;
     if (ir.headerDistTwips !== void 0) section.headerDistancePx = round2(twipsToPx(ir.headerDistTwips));
     if (ir.footerDistTwips !== void 0) section.footerDistancePx = round2(twipsToPx(ir.footerDistTwips));
+    if (ir.pageBorders) section.pageBorders = irPageBordersToModel(ir.pageBorders);
     return section;
   }
   return {
     mapBlocks,
     mapSection,
     emptyParagraph,
-    lists: () => Object.fromEntries(usedLists),
+    // Realize EVERY defined numbering definition (not just referenced ones) so a
+    // list style authored in the editor survives save→reopen before it's applied.
+    lists: () => {
+      for (const numId of numbering.keys()) listDefFor(numId);
+      return Object.fromEntries(usedLists);
+    },
     bookmarks: () => {
       const out = {};
       for (const [id2, s] of bookmarkStarts) {
@@ -1515,16 +1664,6 @@ function mapSdts(ir) {
   }
   return out;
 }
-function collectUsedStyleIds(blocks, into = /* @__PURE__ */ new Set()) {
-  for (const b of blocks) {
-    if (b.kind === "paragraph") {
-      if (b.props.styleId) into.add(b.props.styleId);
-    } else {
-      for (const row of b.rows) for (const cell of row.cells) collectUsedStyleIds(cell.blocks, into);
-    }
-  }
-  return into;
-}
 function mapCharPatch(props) {
   const out = {};
   applyRunProps(out, props);
@@ -1545,27 +1684,27 @@ function mapParaPatch(props) {
   if (props.tabStops) out.tabStops = mapTabStops(props.tabStops);
   return out;
 }
-function buildStylesheet(data, usedIds) {
+function buildStylesheet(data) {
   if (data.styles.size === 0) return void 0;
   const include = /* @__PURE__ */ new Set();
-  const addWithBases = (id) => {
-    for (let cur = data.styles.get(id); cur && !include.has(cur.id); cur = cur.basedOnId ? data.styles.get(cur.basedOnId) : void 0) {
-      if (cur.type === "paragraph") include.add(cur.id);
-    }
-  };
-  for (const id of usedIds) addWithBases(id);
-  if (data.defaultParaStyleId) addWithBases(data.defaultParaStyleId);
+  for (const def of data.styles.values()) {
+    if (def.type === "paragraph" || def.type === "character") include.add(def.id);
+  }
   if (include.size === 0) return void 0;
   const styles = [];
   for (const id of include) {
     const def = data.styles.get(id);
+    const isChar = def.type === "character";
     const style = {
       id,
       name: def.name ?? id,
+      type: isChar ? "character" : "paragraph",
       char: mapCharPatch(def.rPr),
-      para: mapParaPatch(def.pPr)
+      para: isChar ? {} : mapParaPatch(def.pPr)
     };
-    if (def.basedOnId && include.has(def.basedOnId)) style.basedOn = def.basedOnId;
+    if (def.basedOnId && include.has(def.basedOnId) && data.styles.get(def.basedOnId)?.type === def.type) {
+      style.basedOn = def.basedOnId;
+    }
     styles.push(style);
   }
   styles.sort(
@@ -1573,6 +1712,38 @@ function buildStylesheet(data, usedIds) {
   );
   return { styles, defaultStyleId: data.defaultParaStyleId ?? styles[0].id };
 }
+function buildTableStyles(data) {
+  const include = /* @__PURE__ */ new Set();
+  for (const def of data.styles.values()) if (def.type === "table") include.add(def.id);
+  if (include.size === 0) return void 0;
+  const condProps = (rPr, pPr, borders, shd) => {
+    const cp = {};
+    const char = mapCharPatch(rPr);
+    if (Object.keys(char).length > 0) cp.char = char;
+    const para = mapParaPatch(pPr);
+    if (Object.keys(para).length > 0) cp.para = para;
+    const cb = cellBordersFromIR(borders);
+    if (cb) cp.borders = cb;
+    if (shd !== void 0) cp.shading = shd;
+    return cp;
+  };
+  const out = {};
+  for (const id of include) {
+    const def = data.styles.get(id);
+    const conds = {
+      wholeTable: condProps(def.rPr, def.pPr, def.tblBorders, def.tblShd)
+    };
+    for (const [cond, c] of Object.entries(def.tblStylePr ?? {})) {
+      conds[cond] = condProps(c.rPr, c.pPr, c.borders, c.shd);
+    }
+    const style = { id, name: def.name ?? id, conds };
+    if (def.basedOnId && include.has(def.basedOnId)) style.basedOn = def.basedOnId;
+    if (def.rowBandSize !== void 0) style.rowBandSize = def.rowBandSize;
+    if (def.colBandSize !== void 0) style.colBandSize = def.colBandSize;
+    out[id] = style;
+  }
+  return out;
+}
 function mapParaStyle(props) {
   const style = { ...DEFAULT_PARA };
   if (props.align) style.align = props.align;
@@ -1843,7 +2014,29 @@ function parseStylesXml(xmlText, warnings) {
         if (borders) def.tblBorders = borders;
         const shd = decodeShdFill(el(tblPr, "w:shd"));
         if (shd) def.tblShd = shd;
+        const rowBand = val(tblPr, "w:tblStyleRowBandSize");
+        if (rowBand && Number.isFinite(Number(rowBand))) def.rowBandSize = Number(rowBand);
+        const colBand = val(tblPr, "w:tblStyleColBandSize");
+        if (colBand && Number.isFinite(Number(colBand))) def.colBandSize = Number(colBand);
+      }
+      const conds = {};
+      for (const sp of els(style, "w:tblStylePr")) {
+        const condType = attr(sp, "w:type");
+        if (!condType) continue;
+        const rPrEl2 = el(sp, "w:rPr");
+        const pPrEl2 = el(sp, "w:pPr");
+        const tcPr = el(sp, "w:tcPr");
+        const cond = {
+          rPr: rPrEl2 ? decodeRunProps(rPrEl2) : {},
+          pPr: pPrEl2 ? decodeParaProps(pPrEl2, warnings) : {}
+        };
+        const cb = tcPr && decodeBorders(el(tcPr, "w:tcBorders"));
+        if (cb) cond.borders = cb;
+        const cs = tcPr && decodeShdFill(el(tcPr, "w:shd"));
+        if (cs) cond.shd = cs;
+        conds[condType] = cond;
       }
+      if (Object.keys(conds).length > 0) def.tblStylePr = conds;
     }
     data.styles.set(id, def);
     const isDefault = attr(style, "w:default");
@@ -2072,6 +2265,7 @@ function runImport(bytes, onProgress, opts) {
   const blocks = mapper.mapBlocks(ir.blocks, mediaFor(rels), linkResolverFor(rels));
   if (blocks.length === 0) blocks.push(mapper.emptyParagraph());
   const section = mapper.mapSection(ir.section);
+  if (ir.pageColorHex) section.pageColorHex = `#${ir.pageColorHex}`;
   const settingsXml = partByRelType(archive, rels, "settings") ?? archive.text("word/settings.xml");
   const evenAndOdd = settingsXml !== void 0 && hasEvenAndOdd(settingsXml);
   mapBands(section, "header", ir.section?.headerRefs, ir.section?.titlePg ?? false, evenAndOdd, archive, rels, mapper, mediaFor, warnings, ir.sdts);
@@ -2107,8 +2301,10 @@ function runImport(bytes, onProgress, opts) {
   if (Object.keys(lists).length > 0) doc.lists = lists;
   const bookmarks = mapper.bookmarks();
   if (Object.keys(bookmarks).length > 0) doc.bookmarks = bookmarks;
-  const stylesheet = buildStylesheet(styles, collectUsedStyleIds(ir.blocks));
+  const stylesheet = buildStylesheet(styles);
   if (stylesheet) doc.stylesheet = stylesheet;
+  const tableStyles = buildTableStyles(styles);
+  if (tableStyles) doc.tableStyles = tableStyles;
   const toc = mapper.tocField();
   if (toc) {
     doc.tocInstruction = toc.instruction;
@@ -2172,4 +2368,4 @@ function partNameByRelType(rels, kind) {
 export {
   runImport
 };
-//# sourceMappingURL=chunk-22JHAERT.js.map
+//# sourceMappingURL=chunk-57L5XMCL.js.map