@yinyoudexing/xml2word 0.1.1 → 0.1.3

package/dist/{htmlToWordBodyXml-AG3GTZEZ.js → htmlToWordBodyXml-SIVUZ7K7.js}

@@ -7,6 +7,12 @@ function shouldPreserveSpace(text) {
   if (!text) return false;
   return /^\s/.test(text) || /\s$/.test(text) || /\s{2,}/.test(text);
 }
+function shouldKeepWhitespaceOnlyRun(text) {
+  if (!text) return false;
+  if (/\r|\n/.test(text)) return false;
+  if (text.includes("\xA0")) return true;
+  return /\s{2,}/.test(text);
+}
 function parseStyleAttribute(style) {
   if (!style) return {};
   const normalized = style.replace(/\r/g, "\n");
@@ -36,6 +42,17 @@ function parseCssColorToHex(value) {
   if (hex) return hex.toUpperCase();
   return parseRgbToHex(v);
 }
+function extractBackgroundFillHex(css) {
+  const raw = (css["background-color"] ?? css.background)?.trim();
+  if (!raw) return void 0;
+  const direct = parseCssColorToHex(raw);
+  if (direct) return direct;
+  const hex = raw.match(/#([0-9a-fA-F]{6})/)?.[0];
+  if (hex) return parseCssColorToHex(hex);
+  const rgb = raw.match(/rgb\(\s*\d{1,3}\s*,\s*\d{1,3}\s*,\s*\d{1,3}\s*\)/)?.[0];
+  if (rgb) return parseCssColorToHex(rgb);
+  return void 0;
+}
 function parseFontSizeToHalfPoints(value) {
   if (!value) return void 0;
   const v = value.trim().toLowerCase();
@@ -106,6 +123,7 @@ function getTextContent(node) {
   for (const c of children) out += getTextContent(c);
   return out;
 }
+var IMAGE_RELATIONSHIP_ID_OFFSET = 7;
 function decodeBase64ToUint8Array(base64) {
   const BufferCtor = globalThis.Buffer;
   if (BufferCtor) {
@@ -226,7 +244,7 @@ function collectInlineRuns(node, inherited, out, result) {
       const intrinsic = parseIntrinsicImageSizePx(parsed.contentType, parsed.data);
       const { widthPx, heightPx } = computeImageSizePx(node, intrinsic);
       const id = result.images.length + 1;
-      const relationshipId = `rId${id}`;
+      const relationshipId = `rId${id + IMAGE_RELATIONSHIP_ID_OFFSET}`;
       const target = `media/image${id}.${parsed.extension}`;
       result.images.push({
         relationshipId,
@@ -249,7 +267,7 @@ function collectInlineRuns(node, inherited, out, result) {
       const intrinsic = Number.isFinite(bufferW) && bufferW && Number.isFinite(bufferH) && bufferH ? { widthPx: Math.max(1, Math.round(bufferW)), heightPx: Math.max(1, Math.round(bufferH)) } : parseIntrinsicImageSizePx(parsed.contentType, parsed.data);
       const { widthPx, heightPx } = computeImageSizePx(node, intrinsic);
       const id = result.images.length + 1;
-      const relationshipId = `rId${id}`;
+      const relationshipId = `rId${id + IMAGE_RELATIONSHIP_ID_OFFSET}`;
       const target = `media/image${id}.${parsed.extension}`;
       result.images.push({
         relationshipId,
@@ -350,9 +368,12 @@ function inferFirstFontSizeHalfPoints(node) {
   }
   return void 0;
 }
-function buildParagraphPrXml(node, baseFontHalfPoints, extraInd) {
+function buildParagraphPrXml(node, baseFontHalfPoints, extraInd, pStyleId) {
   const css = parseStyleAttribute(node.attribs?.style);
   const parts = [];
+  if (pStyleId) parts.push(`<w:pStyle w:val="${escapeXmlText(pStyleId)}"/>`);
+  const shdHex = extractBackgroundFillHex(css);
+  if (shdHex) parts.push(`<w:shd w:val="clear" w:color="auto" w:fill="${shdHex}"/>`);
   const align = css["text-align"]?.trim().toLowerCase();
   const jcVal = align === "center" ? "center" : align === "right" ? "right" : align === "justify" ? "both" : void 0;
   if (jcVal) parts.push(`<w:jc w:val="${jcVal}"/>`);
@@ -403,15 +424,16 @@ function buildParagraphPrXml(node, baseFontHalfPoints, extraInd) {
   if (!parts.length) return "";
   return `<w:pPr>${parts.join("")}</w:pPr>`;
 }
-function buildParagraphXmlFromContainer(node, baseStyle, extraInd, result) {
-  const baseFontHalfPoints = baseStyle.fontSizeHalfPoints ?? inferFirstFontSizeHalfPoints(node) ?? 28;
-  const pPrXml = buildParagraphPrXml(node, baseFontHalfPoints, extraInd);
+function buildParagraphXmlFromContainer(node, baseStyle, extraInd, pStyleId, result) {
+  const containerStyle = mergeTextStyle(baseStyle, styleFromElement(node));
+  const baseFontHalfPoints = containerStyle.fontSizeHalfPoints ?? inferFirstFontSizeHalfPoints(node) ?? 28;
+  const pPrXml = buildParagraphPrXml(node, baseFontHalfPoints, extraInd, pStyleId);
   const runs = [];
   const res = result ?? {
     bodyXml: "",
     images: []
   };
-  for (const c of node.children ?? []) collectInlineRuns(c, baseStyle, runs, res);
+  for (const c of node.children ?? []) collectInlineRuns(c, containerStyle, runs, res);
   const rXml = [];
   for (const token of runs) {
     if (token.kind === "br") {
@@ -424,7 +446,7 @@ function buildParagraphXmlFromContainer(node, baseStyle, extraInd, result) {
     }
     const text = token.text;
     if (!text) continue;
-    if (!text.trim()) continue;
+    if (!text.trim() && !shouldKeepWhitespaceOnlyRun(text)) continue;
     rXml.push(buildRunXml(token.style, text));
   }
   if (!rXml.length) return "";
@@ -445,25 +467,30 @@ function isExplicitPageBreak(node) {
   if (after?.includes("always") || before?.includes("always")) return true;
   return false;
 }
-function buildHeadingBaseStyle(level) {
-  const size = level === 1 ? 44 : level === 2 ? 32 : level === 3 ? 28 : level === 4 ? 24 : 22;
-  return { bold: true, fontSizeHalfPoints: size };
-}
-function buildListBlocks(listNode, ordered, result) {
-  const items = [];
-  const stack = [...listNode.children ?? []];
-  while (stack.length) {
-    const n = stack.shift();
-    if (n.type === "tag" && n.name?.toLowerCase() === "li") items.push(n);
-  }
+function buildListBlocks(listNode, ordered, level, result) {
+  const liNodes = (listNode.children ?? []).filter(
+    (c) => c.type === "tag" && c.name?.toLowerCase() === "li"
+  );
+  if (!liNodes.length) return [];
   const out = [];
-  for (let i = 0; i < items.length; i++) {
-    const prefix = ordered ? `${i + 1}. ` : "\u2022 ";
-    const li = items[i];
-    const baseStyle = {};
+  const numId = ordered ? 2 : 1;
+  const ilvl = Math.max(0, Math.min(8, Math.floor(level)));
+  const leftTwips = 720 * (ilvl + 1);
+  const hangingTwips = 360;
+  for (const li of liNodes) {
+    const nestedLists = [];
+    const baseStyle = styleFromElement(li);
     const runs = [];
-    runs.push({ kind: "text", text: prefix, style: baseStyle });
-    for (const c of li.children ?? []) collectInlineRuns(c, baseStyle, runs, result);
+    for (const c of li.children ?? []) {
+      if (c.type === "tag") {
+        const tag = c.name?.toLowerCase();
+        if (tag === "ul" || tag === "ol") {
+          nestedLists.push(c);
+          continue;
+        }
+      }
+      collectInlineRuns(c, baseStyle, runs, result);
+    }
     const rXml = [];
     for (const token of runs) {
       if (token.kind === "br") {
@@ -476,18 +503,143 @@ function buildListBlocks(listNode, ordered, result) {
       }
       const text = token.text;
       if (!text) continue;
-      if (!text.trim()) continue;
+      if (!text.trim() && !shouldKeepWhitespaceOnlyRun(text)) continue;
       rXml.push(buildRunXml(token.style, text));
     }
-    if (!rXml.length) continue;
-    const pPrXml = buildParagraphPrXml(li, inferFirstFontSizeHalfPoints(li) ?? 28, {
-      leftTwips: 720,
-      hangingTwips: 360
-    });
-    out.push(`<w:p>${pPrXml}${rXml.join("")}</w:p>`);
+    if (rXml.length) {
+      const baseFontHalfPoints = inferFirstFontSizeHalfPoints(li) ?? 28;
+      const pPrXml = buildParagraphPrXml(
+        li,
+        baseFontHalfPoints,
+        { leftTwips, hangingTwips },
+        void 0
+      );
+      const numPrXml = `<w:numPr><w:ilvl w:val="${ilvl}"/><w:numId w:val="${numId}"/></w:numPr>`;
+      const mergedPPrXml = pPrXml ? pPrXml.replace("<w:pPr>", `<w:pPr>${numPrXml}`) : `<w:pPr>${numPrXml}<w:ind w:left="${leftTwips}" w:hanging="${hangingTwips}"/></w:pPr>`;
+      out.push(`<w:p>${mergedPPrXml}${rXml.join("")}</w:p>`);
+    }
+    for (const nested of nestedLists) {
+      const nestedOrdered = nested.name?.toLowerCase() === "ol";
+      out.push(...buildListBlocks(nested, nestedOrdered, ilvl + 1, result));
+    }
   }
   return out;
 }
+function parseCellWidthTwips(node) {
+  const css = parseStyleAttribute(node.attribs?.style);
+  const width = parseCssLengthToTwips(css.width, 28);
+  if (typeof width !== "number" || width <= 0) return void 0;
+  return width;
+}
+function estimateTextWidthTwips(text, baseFontHalfPoints) {
+  const basePt = baseFontHalfPoints / 2;
+  const cjkRegex = /[\u3400-\u4dbf\u4e00-\u9fff\u3000-\u303f\uff00-\uffef]/;
+  let cjk = 0;
+  let latin = 0;
+  let spaces = 0;
+  for (const ch of text) {
+    if (ch === " " || ch === "	") {
+      spaces++;
+      continue;
+    }
+    if (cjkRegex.test(ch)) {
+      cjk++;
+      continue;
+    }
+    latin++;
+  }
+  const cjkTwips = Math.round(basePt * 20);
+  const latinTwips = Math.round(basePt * 11);
+  const spaceTwips = Math.round(basePt * 6);
+  return cjk * cjkTwips + latin * latinTwips + spaces * spaceTwips;
+}
+function parseBorderShorthand(value, baseFontHalfPoints) {
+  if (!value) return void 0;
+  const raw = value.trim().toLowerCase();
+  if (!raw) return void 0;
+  if (raw === "none" || raw === "0") return { val: "nil", sz: 0 };
+  const tokens = raw.split(/\s+/).filter(Boolean);
+  if (!tokens.length) return void 0;
+  const css = Object.fromEntries(tokens.map((t, i) => [`${i}`, t]));
+  const widthToken = Object.values(css).find((t) => /^(?:\d+(?:\.\d+)?)(?:px|pt)?$/.test(t));
+  const styleToken = Object.values(css).find(
+    (t) => ["none", "solid", "dashed", "dotted", "double", "hidden"].includes(t)
+  );
+  const colorToken = Object.values(css).find((t) => t.startsWith("#") || t.startsWith("rgb("));
+  const widthTwips = parseCssLengthToTwips(widthToken, baseFontHalfPoints);
+  const sz = (() => {
+    if (typeof widthTwips !== "number") return 4;
+    if (widthTwips <= 0) return 0;
+    return Math.max(2, Math.round(widthTwips * 0.4));
+  })();
+  const val = (() => {
+    if (!styleToken) return "single";
+    if (styleToken === "none" || styleToken === "hidden") return "nil";
+    if (styleToken === "solid") return "single";
+    if (styleToken === "dashed") return "dashed";
+    if (styleToken === "dotted") return "dotted";
+    if (styleToken === "double") return "double";
+    return "single";
+  })();
+  const colorHex = parseCssColorToHex(colorToken);
+  return { val, sz, colorHex };
+}
+function buildBorderTag(tag, border, fallbackColorHex) {
+  const b = border ?? { val: "single", sz: 4, colorHex: fallbackColorHex };
+  const color = (b.colorHex ?? fallbackColorHex).toUpperCase();
+  return `<w:${tag} w:val="${b.val}" w:sz="${b.sz}" w:space="0" w:color="${color}"/>`;
+}
+function injectTableCellParagraphSpacing(pXml) {
+  if (!pXml.includes("<w:p")) return pXml;
+  if (!pXml.includes("<w:p>")) return pXml;
+  const spacingXml = '<w:spacing w:before="0" w:after="0" w:line="360" w:lineRule="auto"/><w:wordWrap w:val="1"/>';
+  if (pXml.includes("<w:pPr>")) {
+    if (pXml.includes("<w:spacing ")) return pXml;
+    return pXml.replace("<w:pPr>", `<w:pPr>${spacingXml}`);
+  }
+  return pXml.replace("<w:p>", `<w:p><w:pPr>${spacingXml}</w:pPr>`);
+}
+function buildTableCellBlocksXml(cell, baseStyle, result) {
+  const children = cell.children ?? [];
+  const hasBlocks = children.some((c) => {
+    if (c.type !== "tag") return false;
+    const tag = c.name?.toLowerCase();
+    return tag === "p" || tag === "ul" || tag === "ol" || tag === "img" || tag === "canvas" || /^h[1-6]$/.test(tag ?? "");
+  });
+  const out = [];
+  if (!hasBlocks) {
+    const p = buildParagraphXmlFromContainer(cell, baseStyle, void 0, void 0, result);
+    if (p) out.push(p);
+    return out.length ? out.map(injectTableCellParagraphSpacing).join("") : "<w:p/>";
+  }
+  for (const c of children) {
+    if (c.type === "tag") {
+      const tag = c.name?.toLowerCase();
+      if (tag === "p") {
+        const p = buildParagraphXmlFromContainer(c, baseStyle, void 0, void 0, result);
+        if (p) out.push(p);
+        continue;
+      }
+      if (tag && /^h[1-6]$/.test(tag)) {
+        const level = Number(tag.slice(1));
+        const p = buildParagraphXmlFromContainer(c, baseStyle, void 0, `Heading${level}`, result);
+        if (p) out.push(p);
+        continue;
+      }
+      if (tag === "ul" || tag === "ol") {
+        out.push(...buildListBlocks(c, tag === "ol", 0, result));
+        continue;
+      }
+      if (tag === "img" || tag === "canvas") {
+        const p = buildParagraphXmlFromSingleInlineNode(c, baseStyle, result);
+        if (p) out.push(p);
+        continue;
+      }
+    }
+  }
+  if (!out.length) return "<w:p/>";
+  return out.map(injectTableCellParagraphSpacing).join("");
+}
 function buildTableXml(tableNode, result) {
   const rows = [];
   const stack = [...tableNode.children ?? []];
@@ -496,25 +648,137 @@ function buildTableXml(tableNode, result) {
     if (n.type === "tag" && n.name?.toLowerCase() === "tr") rows.push(n);
     if (n.children?.length) stack.unshift(...n.children);
   }
-  const rowXml = [];
-  for (const tr of rows) {
-    const cells = (tr.children ?? []).filter(
-      (c) => c.type === "tag" && (c.name === "td" || c.name === "th")
+  const rowCells = rows.map(
+    (tr) => (tr.children ?? []).filter((c) => c.type === "tag" && (c.name === "td" || c.name === "th"))
+  );
+  const colCount = Math.max(0, ...rowCells.map((cells) => cells.length));
+  const maxTableWidthTwips = 9360;
+  const estimatedColWidths = new Array(colCount).fill(0).map((_, i) => {
+    let explicit;
+    let estimated = 0;
+    for (const cells of rowCells) {
+      const cell = cells[i];
+      if (!cell) continue;
+      const w = parseCellWidthTwips(cell);
+      if (typeof w === "number") explicit = explicit ?? w;
+      const text = getTextContent(cell).replace(/\s+/g, " ").trim();
+      if (!text) continue;
+      const baseFontHalfPoints = inferFirstFontSizeHalfPoints(cell) ?? 28;
+      const wTwips = estimateTextWidthTwips(text, baseFontHalfPoints) + 240;
+      estimated = Math.max(estimated, wTwips);
+    }
+    const base = typeof explicit === "number" ? explicit : estimated || Math.round(maxTableWidthTwips / Math.max(1, colCount));
+    return Math.max(720, Math.min(6e3, Math.round(base)));
+  });
+  const normalizedColWidths = (() => {
+    const sum = estimatedColWidths.reduce((a, b) => a + b, 0);
+    if (!sum) return estimatedColWidths;
+    if (sum <= maxTableWidthTwips) return estimatedColWidths;
+    const scaled = estimatedColWidths.map(
+      (w) => Math.max(720, Math.floor(w * maxTableWidthTwips / sum))
     );
+    const scaledSum = scaled.reduce((a, b) => a + b, 0);
+    const diff = maxTableWidthTwips - scaledSum;
+    if (diff !== 0 && scaled.length) scaled[scaled.length - 1] = Math.max(720, scaled[scaled.length - 1] + diff);
+    return scaled;
+  })();
+  const tblGrid = `<w:tblGrid>${normalizedColWidths.map((w) => `<w:gridCol w:w="${w}"/>`).join("")}</w:tblGrid>`;
+  const rowXml = [];
+  for (let rowIdx = 0; rowIdx < rows.length; rowIdx++) {
+    const tr = rows[rowIdx];
+    const cells = rowCells[rowIdx] ?? [];
     const cellXml = [];
-    for (const cell of cells) {
+    for (let i = 0; i < cells.length; i++) {
+      const cell = cells[i];
       const isHeader = cell.name === "th";
       const baseStyle = isHeader ? { bold: true } : {};
-      const pXml = buildParagraphXmlFromContainer(cell, baseStyle, void 0, result);
-      const paragraphs = pXml ? pXml : "<w:p/>";
-      cellXml.push(
-        `<w:tc><w:tcPr><w:tcW w:w="0" w:type="auto"/></w:tcPr>${paragraphs}</w:tc>`
-      );
+      const paragraphs = buildTableCellBlocksXml(cell, baseStyle, result);
+      const css = parseStyleAttribute(cell.attribs?.style);
+      const widthTwips = parseCellWidthTwips(cell) ?? normalizedColWidths[i];
+      const tcW = typeof widthTwips === "number" ? `<w:tcW w:w="${widthTwips}" w:type="dxa"/>` : `<w:tcW w:w="0" w:type="auto"/>`;
+      const vAlign = (() => {
+        const v = css["vertical-align"]?.trim().toLowerCase();
+        if (!v) return "";
+        if (v === "middle" || v === "center") return '<w:vAlign w:val="center"/>';
+        if (v === "bottom") return '<w:vAlign w:val="bottom"/>';
+        if (v === "top") return '<w:vAlign w:val="top"/>';
+        return "";
+      })();
+      const shd = (() => {
+        const hex = parseCssColorToHex(css["background-color"]);
+        if (!hex) return "";
+        return `<w:shd w:val="clear" w:color="auto" w:fill="${hex}"/>`;
+      })();
+      const noWrap = (() => {
+        const ws = css["white-space"]?.trim().toLowerCase();
+        if (ws?.includes("nowrap")) return "<w:noWrap/>";
+        return "";
+      })();
+      const cellBorder = (() => {
+        const bAll = parseBorderShorthand(css.border, 28);
+        const bTop = parseBorderShorthand(css["border-top"] ?? css.border, 28);
+        const bLeft = parseBorderShorthand(css["border-left"] ?? css.border, 28);
+        const bBottom = parseBorderShorthand(css["border-bottom"] ?? css.border, 28);
+        const bRight = parseBorderShorthand(css["border-right"] ?? css.border, 28);
+        const any = bAll || css.border || css["border-top"] || css["border-left"] || css["border-bottom"] || css["border-right"];
+        if (!any) return "";
+        const fallback = bAll?.colorHex ?? "D9D9D9";
+        return `<w:tcBorders>${buildBorderTag("top", bTop, fallback)}${buildBorderTag(
+          "left",
+          bLeft,
+          fallback
+        )}${buildBorderTag("bottom", bBottom, fallback)}${buildBorderTag(
+          "right",
+          bRight,
+          fallback
+        )}</w:tcBorders>`;
+      })();
+      cellXml.push(`<w:tc><w:tcPr>${tcW}${vAlign}${shd}${noWrap}${cellBorder}</w:tcPr>${paragraphs}</w:tc>`);
     }
     if (cellXml.length) rowXml.push(`<w:tr>${cellXml.join("")}</w:tr>`);
   }
-  const tblPr = `<w:tblPr><w:tblW w:w="0" w:type="auto"/><w:tblBorders><w:top w:val="single" w:sz="4" w:space="0" w:color="D9D9D9"/><w:left w:val="single" w:sz="4" w:space="0" w:color="D9D9D9"/><w:bottom w:val="single" w:sz="4" w:space="0" w:color="D9D9D9"/><w:right w:val="single" w:sz="4" w:space="0" w:color="D9D9D9"/><w:insideH w:val="single" w:sz="4" w:space="0" w:color="D9D9D9"/><w:insideV w:val="single" w:sz="4" w:space="0" w:color="D9D9D9"/></w:tblBorders></w:tblPr>`;
-  const tblGrid = `<w:tblGrid/>`;
+  const tblCss = parseStyleAttribute(tableNode.attribs?.style);
+  const tblAlign = (() => {
+    const ml = tblCss["margin-left"]?.trim().toLowerCase();
+    const mr = tblCss["margin-right"]?.trim().toLowerCase();
+    const m = tblCss.margin?.trim().toLowerCase();
+    if (ml === "auto" && mr === "auto" || (m?.includes("auto") ?? false)) return '<w:tblJc w:val="center"/>';
+    const ta = tblCss["text-align"]?.trim().toLowerCase();
+    if (ta === "center") return '<w:tblJc w:val="center"/>';
+    if (ta === "right") return '<w:tblJc w:val="right"/>';
+    return "";
+  })();
+  const tblBorder = (() => {
+    const border = parseBorderShorthand(tblCss.border, 28);
+    if (tblCss.border) {
+      const fallback2 = border?.colorHex ?? "D9D9D9";
+      return `<w:tblBorders>${buildBorderTag("top", border, fallback2)}${buildBorderTag(
+        "left",
+        border,
+        fallback2
+      )}${buildBorderTag("bottom", border, fallback2)}${buildBorderTag(
+        "right",
+        border,
+        fallback2
+      )}${buildBorderTag("insideH", border, fallback2)}${buildBorderTag(
+        "insideV",
+        border,
+        fallback2
+      )}</w:tblBorders>`;
+    }
+    const fallback = "D9D9D9";
+    return `<w:tblBorders>${buildBorderTag("top", void 0, fallback)}${buildBorderTag(
+      "left",
+      void 0,
+      fallback
+    )}${buildBorderTag("bottom", void 0, fallback)}${buildBorderTag(
+      "right",
+      void 0,
+      fallback
+    )}${buildBorderTag("insideH", void 0, fallback)}${buildBorderTag("insideV", void 0, fallback)}</w:tblBorders>`;
+  })();
+  const tblW = `<w:tblW w:w="${normalizedColWidths.reduce((a, b) => a + b, 0)}" w:type="dxa"/>`;
+  const tblPr = `<w:tblPr>${tblW}<w:tblLayout w:type="fixed"/>${tblAlign}${tblBorder}</w:tblPr>`;
   return `<w:tbl>${tblPr}${tblGrid}${rowXml.join("")}</w:tbl>`;
 }
 function buildParagraphXmlFromSingleInlineNode(node, baseStyle, result) {
@@ -524,7 +788,71 @@ function buildParagraphXmlFromSingleInlineNode(node, baseStyle, result) {
     attribs: { style: "text-align: center;" },
     children: [node]
   };
-  return buildParagraphXmlFromContainer(wrapper, baseStyle, void 0, result);
+  return buildParagraphXmlFromContainer(wrapper, baseStyle, void 0, void 0, result);
+}
+function isRecognizedBlockTag(tag) {
+  if (!tag) return false;
+  if (tag === "p") return true;
+  if (tag === "table") return true;
+  if (tag === "ul" || tag === "ol") return true;
+  if (tag === "img" || tag === "canvas") return true;
+  if (/^h[1-6]$/.test(tag)) return true;
+  if (tag === "pre") return true;
+  return false;
+}
+function collectDivBlocks(node, out, result) {
+  const parentStyle = node.attribs?.style;
+  const inlineBuffer = [];
+  const flushInline = () => {
+    const wrapper = {
+      type: "tag",
+      name: "p",
+      attribs: { style: parentStyle },
+      children: inlineBuffer.splice(0)
+    };
+    const pXml = buildParagraphXmlFromContainer(wrapper, {}, void 0, void 0, result);
+    if (pXml) out.push(pXml);
+  };
+  const children = node.children ?? [];
+  for (const child of children) {
+    if (child.type === "tag") {
+      const tag = child.name?.toLowerCase();
+      if (isExplicitPageBreak(child)) {
+        if (inlineBuffer.length) flushInline();
+        out.push(PAGE_BREAK_XML);
+        continue;
+      }
+      if (isRecognizedBlockTag(tag)) {
+        if (inlineBuffer.length) flushInline();
+        collectBodyBlocks(child, out, result);
+        continue;
+      }
+      if (tag === "div") {
+        const childHasRecognizedBlocks = (child.children ?? []).some((gc) => {
+          if (gc.type !== "tag") return false;
+          return isRecognizedBlockTag(gc.name?.toLowerCase());
+        });
+        if (childHasRecognizedBlocks) {
+          if (inlineBuffer.length) flushInline();
+          collectBodyBlocks(child, out, result);
+          continue;
+        }
+        if (inlineBuffer.length) flushInline();
+        const mergedStyle = [parentStyle, child.attribs?.style].filter(Boolean).join(";");
+        const wrapper = {
+          type: "tag",
+          name: "p",
+          attribs: { style: mergedStyle || void 0 },
+          children: child.children ?? []
+        };
+        const pXml = buildParagraphXmlFromContainer(wrapper, {}, void 0, void 0, result);
+        if (pXml) out.push(pXml);
+        continue;
+      }
+    }
+    inlineBuffer.push(child);
+  }
+  if (inlineBuffer.length) flushInline();
 }
 function collectBodyBlocks(node, out, result) {
   if (isSkippableSubtree(node)) return;
@@ -535,7 +863,7 @@ function collectBodyBlocks(node, out, result) {
       return;
     }
     if (tag === "p") {
-      const pXml = buildParagraphXmlFromContainer(node, {}, void 0, result);
+      const pXml = buildParagraphXmlFromContainer(node, {}, void 0, void 0, result);
       if (pXml) out.push(pXml);
       return;
     }
@@ -546,7 +874,7 @@ function collectBodyBlocks(node, out, result) {
     }
     if (tag && /^h[1-6]$/.test(tag)) {
       const level = Number(tag.slice(1));
-      const hXml = buildParagraphXmlFromContainer(node, buildHeadingBaseStyle(level), void 0, result);
+      const hXml = buildParagraphXmlFromContainer(node, {}, void 0, `Heading${level}`, result);
       if (hXml) out.push(hXml);
       return;
     }
@@ -556,7 +884,11 @@ function collectBodyBlocks(node, out, result) {
       return;
     }
     if (tag === "ul" || tag === "ol") {
-      out.push(...buildListBlocks(node, tag === "ol", result));
+      out.push(...buildListBlocks(node, tag === "ol", 0, result));
+      return;
+    }
+    if (tag === "div") {
+      collectDivBlocks(node, out, result);
       return;
     }
   }
@@ -624,4 +956,4 @@ export {
   htmlToWordBodyXml,
   textToWordBodyXml
 };
-//# sourceMappingURL=htmlToWordBodyXml-AG3GTZEZ.js.map
+//# sourceMappingURL=htmlToWordBodyXml-SIVUZ7K7.js.map