docgen-utils 1.0.20 → 1.0.22

package/dist/cli.js

@@ -43617,11 +43617,18 @@ async function loadZipSafely(arrayBuffer) {
 }
 
 // node_modules/rtf.js/index.js
+var rtf_exports = {};
+__export(rtf_exports, {
+  EMFJS: () => EMFJS,
+  RTFJS: () => RTFJS,
+  WMFJS: () => WMFJS
+});
 var RTFJS = __toESM(require_RTFJS_bundle());
 var EMFJS = __toESM(require_EMFJS_bundle());
 var WMFJS = __toESM(require_WMFJS_bundle());
 
 // packages/docs/import-docx.ts
+var { EMFJS: EMFJS2 } = rtf_exports;
 var TWIPS_PER_PX = 1440 / 96;
 var EMU_PER_PX = 914400 / 96;
 var HALF_POINTS_TO_PT = 0.5;
@@ -43872,7 +43879,7 @@ async function convertEmfToSvg(buffer2) {
     console.log = () => {
     };
     try {
-      const renderer = new EMFJS.Renderer(buffer2);
+      const renderer = new EMFJS2.Renderer(buffer2);
       const svg = renderer.render({
         width: boundsWidth + "px",
         height: boundsHeight + "px",
@@ -46414,6 +46421,34 @@ function parseDecorativeShapes(spTree, scale, themeColors, imageMap, themeFonts)
 }
 function parseGroupShape(grpSp, scale, themeColors, imageMap, themeFonts) {
   const elements = [];
+  const grpSpPr = findChild2(grpSp, "grpSpPr");
+  const xfrm = grpSpPr ? findChild2(grpSpPr, "xfrm") : null;
+  const grpOff = xfrm ? findChild2(xfrm, "off") : null;
+  const grpExt = xfrm ? findChild2(xfrm, "ext") : null;
+  const chOff = xfrm ? findChild2(xfrm, "chOff") : null;
+  const chExt = xfrm ? findChild2(xfrm, "chExt") : null;
+  const hasTransform = !!(grpOff && grpExt && chOff && chExt);
+  const grpOffX = parseInt(grpOff?.getAttribute("x") ?? "0", 10);
+  const grpOffY = parseInt(grpOff?.getAttribute("y") ?? "0", 10);
+  const grpExtCx = parseInt(grpExt?.getAttribute("cx") ?? "0", 10);
+  const grpExtCy = parseInt(grpExt?.getAttribute("cy") ?? "0", 10);
+  const chOffX = parseInt(chOff?.getAttribute("x") ?? "0", 10);
+  const chOffY = parseInt(chOff?.getAttribute("y") ?? "0", 10);
+  const chExtCx = parseInt(chExt?.getAttribute("cx") ?? "1", 10);
+  const chExtCy = parseInt(chExt?.getAttribute("cy") ?? "1", 10);
+  const scaleX = grpExtCx / chExtCx;
+  const scaleY = grpExtCy / chExtCy;
+  function remapCoords(el) {
+    if (!hasTransform) return;
+    const childXEmu = el.x / scale * EMU_PER_PX2;
+    const childYEmu = el.y / scale * EMU_PER_PX2;
+    const childWEmu = el.w / scale * EMU_PER_PX2;
+    const childHEmu = el.h / scale * EMU_PER_PX2;
+    el.x = Math.round(emuToPx2(grpOffX + (childXEmu - chOffX) * scaleX) * scale);
+    el.y = Math.round(emuToPx2(grpOffY + (childYEmu - chOffY) * scaleY) * scale);
+    el.w = Math.round(emuToPx2(childWEmu * scaleX) * scale);
+    el.h = Math.round(emuToPx2(childHEmu * scaleY) * scale);
+  }
   for (let i = 0; i < grpSp.children.length; i++) {
     const child = grpSp.children[i];
     if (child.localName === "sp") {
@@ -46431,16 +46466,23 @@ function parseGroupShape(grpSp, scale, themeColors, imageMap, themeFonts) {
           const shape2 = parseShape(child, scale, themeColors, themeFonts);
           if (shape2) {
             shape2.clipPath = clipPath;
+            remapCoords(shape2);
             elements.push({ kind: "shape", data: shape2 });
           }
           continue;
         }
       }
       const shape = parseShape(child, scale, themeColors, themeFonts);
-      if (shape) elements.push({ kind: "shape", data: shape });
+      if (shape) {
+        remapCoords(shape);
+        elements.push({ kind: "shape", data: shape });
+      }
     } else if (child.localName === "pic") {
       const img = parsePicture(child, scale, imageMap);
-      if (img) elements.push({ kind: "image", data: img });
+      if (img) {
+        remapCoords(img);
+        elements.push({ kind: "image", data: img });
+      }
     } else if (child.localName === "grpSp") {
       const nested = parseGroupShape(child, scale, themeColors, imageMap, themeFonts);
       elements.push(...nested);
@@ -46616,6 +46658,27 @@ function parseShape(sp, scale, themeColors, themeFonts) {
       }
     }
   }
+  const effectLst = findChild2(spPr, "effectLst");
+  if (effectLst) {
+    const outerShdw = findChild2(effectLst, "outerShdw");
+    if (outerShdw) {
+      const blurRad = parseInt(outerShdw.getAttribute("blurRad") ?? "0", 10);
+      const blurPx = Math.round(emuToPx2(blurRad) * scale);
+      let shadowColor = "rgba(0,0,0,0.3)";
+      const prstClr = findChild2(outerShdw, "prstClr");
+      const srgbClr = findChild2(outerShdw, "srgbClr");
+      if (prstClr || srgbClr) {
+        const colorEl = prstClr ?? srgbClr;
+        const alphaEl = colorEl ? findChild2(colorEl, "alpha") : null;
+        const alphaVal = alphaEl ? parseInt(alphaEl.getAttribute("val") ?? "100000", 10) / 1e5 : 1;
+        const baseColor = prstClr?.getAttribute("val") === "black" ? "0,0,0" : prstClr?.getAttribute("val") === "white" ? "255,255,255" : "0,0,0";
+        shadowColor = `rgba(${baseColor},${alphaVal})`;
+      }
+      if (blurPx > 0) {
+        shape.boxShadow = `0 0 ${blurPx}px ${shadowColor}`;
+      }
+    }
+  }
   const txBody = findChild2(sp, "txBody");
   if (txBody) {
     const bodyPr = findChild2(txBody, "bodyPr");
@@ -47764,6 +47827,9 @@ function renderSlideHtml(elements, bgColor, contentOffsetX = 0) {
       styles.push(`border:${shape.borderWidth}px ${borderStyle} ${shape.borderColor}`);
       styles.push("box-sizing:border-box");
     }
+    if (shape.boxShadow) {
+      styles.push(`box-shadow:${shape.boxShadow}`);
+    }
     if (shape.padding) {
       styles.push(
         `padding:${shape.padding.top}px ${shape.padding.right}px ${shape.padding.bottom}px ${shape.padding.left}px`
@@ -48153,6 +48219,9 @@ async function importPptx(arrayBuffer) {
       } else if (child.localName === "pic") {
         const img = parsePicture(child, scale, imageMap);
         if (img) elements.push({ kind: "image", data: img });
+      } else if (child.localName === "grpSp") {
+        const grpElements = parseGroupShape(child, scale, themeColors, imageMap, themeFonts);
+        elements.push(...grpElements);
       } else if (child.localName === "graphicFrame") {
         const table = parseTable2(child, scale, themeColors, themeFonts, tableStyleMap);
         if (table) {
@@ -68753,6 +68822,28 @@ var UTF16LE = new Uint8Array([255, 254]);
 var UTF16BE = new Uint8Array([254, 255]);
 
 // packages/docs/common.ts
+function isStyledTableCell(cell) {
+  if (typeof cell !== "object" || Array.isArray(cell)) return false;
+  if (!("content" in cell)) return false;
+  const styledCell = cell;
+  const content = styledCell.content;
+  if (typeof content === "string") return true;
+  if (Array.isArray(content) && content.length > 0) {
+    const first = content[0];
+    if (typeof first === "object" && first !== null && "type" in first) {
+      return false;
+    }
+  }
+  return true;
+}
+function isComplexTableCell(cell) {
+  if (typeof cell !== "object" || Array.isArray(cell)) return false;
+  if (!("content" in cell)) return false;
+  const content = cell.content;
+  if (!Array.isArray(content) || content.length === 0) return false;
+  const first = content[0];
+  return typeof first === "object" && first !== null && "type" in first;
+}
 var HEADING_LEVEL_MAP = {
   1: HeadingLevel.HEADING_1,
   2: HeadingLevel.HEADING_2,
@@ -70025,7 +70116,7 @@ function getElementStyles(element, cssContext, parentElement2) {
       }
     }
   }
-  if (!parentElement2) {
+  {
     const fillIn = (source) => {
       for (const [key2, value] of Object.entries(source)) {
         if (value !== void 0 && result[key2] === void 0) {
@@ -71545,7 +71636,73 @@ function detectTimeline(element, cssContext) {
 }
 
 // packages/docs/parse.ts
-function parseContainerContent(element, cssContext, inheritedColor) {
+function getDirectRows(tableEl) {
+  const result = [];
+  for (const child of tableEl.children) {
+    const childTag = child.tagName.toLowerCase();
+    if (childTag === "tr") {
+      result.push(child);
+    } else if (childTag === "thead" || childTag === "tbody" || childTag === "tfoot") {
+      for (const grandchild of child.children) {
+        if (grandchild.tagName.toLowerCase() === "tr") {
+          result.push(grandchild);
+        }
+      }
+    }
+  }
+  return result;
+}
+function getDirectCells(rowEl) {
+  const result = [];
+  for (const child of rowEl.children) {
+    const childTag = child.tagName.toLowerCase();
+    if (childTag === "td" || childTag === "th") {
+      result.push(child);
+    }
+  }
+  return result;
+}
+function cellHasNestedTable(cellEl) {
+  return cellEl.querySelector("table") !== null;
+}
+function isLayoutTable(tableEl, cssContext) {
+  const styles = getElementStyles(tableEl, cssContext);
+  const inlineStyle = tableEl.getAttribute("style") || "";
+  if (inlineStyle.includes("border: none") || inlineStyle.includes("border:none")) {
+    return true;
+  }
+  if (styles.border && styles.border.includes("none")) {
+    return true;
+  }
+  return false;
+}
+function createParsedImageElement(imageEl, imageKey) {
+  const src = imageEl.getAttribute("src")?.trim();
+  if (!src) {
+    return null;
+  }
+  const alt = imageEl.getAttribute("alt") || void 0;
+  let width;
+  let height;
+  const widthAttr = imageEl.getAttribute("width");
+  const heightAttr = imageEl.getAttribute("height");
+  if (widthAttr && !widthAttr.includes("%")) {
+    width = parseInt(widthAttr, 10) || void 0;
+  }
+  if (heightAttr && !heightAttr.includes("%")) {
+    height = parseInt(heightAttr, 10) || void 0;
+  }
+  let caption;
+  const parentFigure = imageEl.closest("figure");
+  if (parentFigure) {
+    const figcaption = parentFigure.querySelector("figcaption");
+    if (figcaption) {
+      caption = getTextContent(figcaption).trim() || void 0;
+    }
+  }
+  return { type: "image", imageKey, src, alt, width, height, caption };
+}
+function parseContainerContent(element, cssContext, nextImageKey, inheritedColor) {
   const innerElements = [];
   function processInnerNode(node, color) {
     if (node.nodeType === Node.TEXT_NODE) {
@@ -71628,18 +71785,48 @@ function parseContainerContent(element, cssContext, inheritedColor) {
     }
     if (tagName19 === "table") {
       const rows = [];
-      for (const tr of el.querySelectorAll("tr")) {
+      const directRows = getDirectRows(el);
+      for (const tr of directRows) {
         const cells = [];
-        for (const cell of tr.querySelectorAll("td, th")) {
+        const directCells = getDirectCells(tr);
+        for (const cell of directCells) {
+          let cellBackgroundColor;
+          const cellStyles = getElementStyles(cell, cssContext, tr);
+          if (cellStyles.backgroundColor) {
+            const hexBg = extractHexColor(cellStyles.backgroundColor);
+            if (hexBg) cellBackgroundColor = hexBg;
+          }
+          if (!cellBackgroundColor) {
+            const inlineStyle = cell.getAttribute("style") || "";
+            if (inlineStyle) {
+              const bgMatch = inlineStyle.match(/background(?:-color)?\s*:\s*([^;]+)/i);
+              if (bgMatch) {
+                const hexBg = extractHexColor(bgMatch[1]);
+                if (hexBg) cellBackgroundColor = hexBg;
+              }
+            }
+          }
           const runs = extractInlineRuns(cell, cssContext);
-          if (runs.length > 0) {
-            if (hasInlineFormatting(runs)) {
-              cells.push(runs);
+          if (cellBackgroundColor) {
+            if (runs.length > 0) {
+              if (hasInlineFormatting(runs)) {
+                cells.push({ content: runs, backgroundColor: cellBackgroundColor });
+              } else {
+                cells.push({ content: runs.map((r) => r.text).join(""), backgroundColor: cellBackgroundColor });
+              }
             } else {
-              cells.push(runs.map((r) => r.text).join(""));
+              cells.push({ content: "", backgroundColor: cellBackgroundColor });
             }
           } else {
-            cells.push("");
+            if (runs.length > 0) {
+              if (hasInlineFormatting(runs)) {
+                cells.push(runs);
+              } else {
+                cells.push(runs.map((r) => r.text).join(""));
+              }
+            } else {
+              cells.push("");
+            }
           }
         }
         if (cells.length > 0) {
@@ -71728,7 +71915,7 @@ function parseContainerContent(element, cssContext, inheritedColor) {
   }
   return innerElements;
 }
-function parseBlockquoteContent(element, cssContext) {
+function parseBlockquoteContent(element, cssContext, nextImageKey) {
   const innerElements = [];
   const blockquoteStyles = getElementStyles(element, cssContext);
   const blockquoteIsItalic = blockquoteStyles.fontStyle === "italic";
@@ -71842,7 +72029,7 @@ function parseBlockquoteContent(element, cssContext) {
         }
         const nestedBorderHex = extractBorderColorFromStyle(styles);
         if (nestedBgColor || nestedBorderHex) {
-          const nestedContent = parseBlockquoteContent(el, cssContext);
+          const nestedContent = parseBlockquoteContent(el, cssContext, nextImageKey);
           if (nestedContent.length > 0) {
             let nestedBorderStyle;
             if (styles.borderLeft && !styles.border) {
@@ -71895,28 +72082,9 @@ function parseBlockquoteContent(element, cssContext) {
       }
     }
     if (tagName19 === "img") {
-      const src = el.getAttribute("src")?.trim();
-      if (src) {
-        const alt = el.getAttribute("alt") || void 0;
-        let width;
-        let height;
-        const widthAttr = el.getAttribute("width");
-        const heightAttr = el.getAttribute("height");
-        if (widthAttr && !widthAttr.includes("%")) {
-          width = parseInt(widthAttr, 10) || void 0;
-        }
-        if (heightAttr && !heightAttr.includes("%")) {
-          height = parseInt(heightAttr, 10) || void 0;
-        }
-        let caption;
-        const parentFigure = el.closest("figure");
-        if (parentFigure) {
-          const figcaption = parentFigure.querySelector("figcaption");
-          if (figcaption) {
-            caption = getTextContent(figcaption).trim() || void 0;
-          }
-        }
-        innerElements.push({ type: "image", src, alt, width, height, caption });
+      const imageElement = createParsedImageElement(el, nextImageKey());
+      if (imageElement) {
+        innerElements.push(imageElement);
       }
       return;
     }
@@ -72087,6 +72255,8 @@ function parseHtmlContent(html) {
   const elements = [];
   const cssContext = parseCssContext(doc);
   const processedSvgs = /* @__PURE__ */ new Set();
+  let imageIndex = 0;
+  const nextImageKey = () => `image-${imageIndex++}`;
   const { body } = doc;
   function processNode(node, inheritedAlignment, inheritedColor) {
     if (node.nodeType === Node.TEXT_NODE) {
@@ -72223,7 +72393,7 @@ function parseHtmlContent(html) {
       return;
     }
     if (tagName19 === "p" && isBlockquoteOrCallout(element, cssContext)) {
-      const content = parseBlockquoteContent(element, cssContext);
+      const content = parseBlockquoteContent(element, cssContext, nextImageKey);
       if (content.length > 0) {
         const elementStyles = getElementStyles(element, cssContext);
         let borderColor;
@@ -72412,18 +72582,62 @@ function parseHtmlContent(html) {
     }
     if (tagName19 === "table") {
       const rows = [];
-      for (const tr of element.querySelectorAll("tr")) {
+      const directRows = getDirectRows(element);
+      for (const tr of directRows) {
         const cells = [];
-        for (const cell of tr.querySelectorAll("td, th")) {
-          const runs = extractInlineRuns(cell, cssContext);
-          if (runs.length > 0) {
-            if (hasInlineFormatting(runs)) {
-              cells.push(runs);
+        const directCells = getDirectCells(tr);
+        for (const cell of directCells) {
+          if (cellHasNestedTable(cell)) {
+            const nestedContent = parseContainerContent(cell, cssContext, nextImageKey);
+            if (nestedContent.length > 0) {
+              cells.push({ content: nestedContent });
             } else {
-              cells.push(runs.map((r) => r.text).join(""));
+              cells.push("");
             }
           } else {
-            cells.push("");
+            let cellBackgroundColor;
+            const cellStylesWithRowParent = getElementStyles(cell, cssContext, tr);
+            if (cellStylesWithRowParent.backgroundColor) {
+              const hexBg = extractHexColor(cellStylesWithRowParent.backgroundColor);
+              if (hexBg) cellBackgroundColor = hexBg;
+            }
+            if (!cellBackgroundColor) {
+              const cellStylesWithTableParent = getElementStyles(cell, cssContext, element);
+              if (cellStylesWithTableParent.backgroundColor) {
+                const hexBg = extractHexColor(cellStylesWithTableParent.backgroundColor);
+                if (hexBg) cellBackgroundColor = hexBg;
+              }
+            }
+            const inlineStyle = cell.getAttribute("style") || "";
+            if (inlineStyle && !cellBackgroundColor) {
+              const bgMatch = inlineStyle.match(/background(?:-color)?\s*:\s*([^;]+)/i);
+              if (bgMatch) {
+                const hexBg = extractHexColor(bgMatch[1]);
+                if (hexBg) cellBackgroundColor = hexBg;
+              }
+            }
+            const runs = extractInlineRuns(cell, cssContext);
+            if (cellBackgroundColor) {
+              if (runs.length > 0) {
+                if (hasInlineFormatting(runs)) {
+                  cells.push({ content: runs, backgroundColor: cellBackgroundColor });
+                } else {
+                  cells.push({ content: runs.map((r) => r.text).join(""), backgroundColor: cellBackgroundColor });
+                }
+              } else {
+                cells.push({ content: "", backgroundColor: cellBackgroundColor });
+              }
+            } else {
+              if (runs.length > 0) {
+                if (hasInlineFormatting(runs)) {
+                  cells.push(runs);
+                } else {
+                  cells.push(runs.map((r) => r.text).join(""));
+                }
+              } else {
+                cells.push("");
+              }
+            }
           }
         }
         if (cells.length > 0) {
@@ -72559,7 +72773,8 @@ function parseHtmlContent(html) {
             }
           }
         }
-        elements.push({ type: "table", rows, cellPadding, headerBackgroundColor, headerTextColor, evenRowBackgroundColor, hasHeader: hasExplicitHeader ? true : void 0, horizontalBordersOnly: horizontalBordersOnly || void 0, columnWidths: calculateColumnWidths(rows, element) });
+        const noBorders = isLayoutTable(element, cssContext);
+        elements.push({ type: "table", rows, cellPadding, headerBackgroundColor, headerTextColor, evenRowBackgroundColor, hasHeader: hasExplicitHeader ? true : void 0, horizontalBordersOnly: horizontalBordersOnly || void 0, noBorders: noBorders || void 0, columnWidths: calculateColumnWidths(rows, element) });
       }
       return;
     }
@@ -72600,8 +72815,8 @@ function parseHtmlContent(html) {
           const sidebarStyles = getElementStyles(sidebarEl, cssContext);
           const sidebarBgColor = sidebarStyles.backgroundColor ? extractHexColor(sidebarStyles.backgroundColor) : void 0;
           const sidebarTextColor = sidebarStyles.color ? extractHexColor(sidebarStyles.color) : void 0;
-          const sidebarContent = parseContainerContent(sidebarEl, cssContext, sidebarTextColor);
-          const mainContent = parseContainerContent(mainEl, cssContext);
+          const sidebarContent = parseContainerContent(sidebarEl, cssContext, nextImageKey, sidebarTextColor);
+          const mainContent = parseContainerContent(mainEl, cssContext, nextImageKey);
           if (sidebarContent.length > 0 || mainContent.length > 0) {
             elements.push({
               type: "two-column-layout",
@@ -72665,7 +72880,7 @@ function parseHtmlContent(html) {
         }
         const columnContents = [];
         for (const col of gridColumns) {
-          const colContent = parseContainerContent(col, cssContext);
+          const colContent = parseContainerContent(col, cssContext, nextImageKey);
           columnContents.push(colContent);
         }
         const hasContent = columnContents.some((c) => c.length > 0);
@@ -73030,56 +73245,18 @@ function parseHtmlContent(html) {
       return;
     }
     if (tagName19 === "img") {
-      const src = element.getAttribute("src")?.trim();
-      if (src) {
-        const alt = element.getAttribute("alt") || void 0;
-        let width;
-        let height;
-        const widthAttr = element.getAttribute("width");
-        const heightAttr = element.getAttribute("height");
-        if (widthAttr && !widthAttr.includes("%")) {
-          width = parseInt(widthAttr, 10) || void 0;
-        }
-        if (heightAttr && !heightAttr.includes("%")) {
-          height = parseInt(heightAttr, 10) || void 0;
-        }
-        let caption;
-        const parentFigure = element.closest("figure");
-        if (parentFigure) {
-          const figcaption = parentFigure.querySelector("figcaption");
-          if (figcaption) {
-            caption = getTextContent(figcaption).trim() || void 0;
-          }
-        }
-        elements.push({ type: "image", src, alt, width, height, caption });
+      const imageElement = createParsedImageElement(element, nextImageKey());
+      if (imageElement) {
+        elements.push(imageElement);
       }
       return;
     }
     if (tagName19 === "picture") {
       const imgEl = element.querySelector("img");
       if (imgEl) {
-        const src = imgEl.getAttribute("src")?.trim();
-        if (src) {
-          const alt = imgEl.getAttribute("alt") || void 0;
-          let width;
-          let height;
-          const widthAttr = imgEl.getAttribute("width");
-          const heightAttr = imgEl.getAttribute("height");
-          if (widthAttr && !widthAttr.includes("%")) {
-            width = parseInt(widthAttr, 10) || void 0;
-          }
-          if (heightAttr && !heightAttr.includes("%")) {
-            height = parseInt(heightAttr, 10) || void 0;
-          }
-          let caption;
-          const parentFigure = element.closest("figure");
-          if (parentFigure) {
-            const figcaption = parentFigure.querySelector("figcaption");
-            if (figcaption) {
-              caption = getTextContent(figcaption).trim() || void 0;
-            }
-          }
-          elements.push({ type: "image", src, alt, width, height, caption });
+        const imageElement = createParsedImageElement(imgEl, nextImageKey());
+        if (imageElement) {
+          elements.push(imageElement);
         }
       }
       return;
@@ -73087,25 +73264,9 @@ function parseHtmlContent(html) {
     if (tagName19 === "figure") {
       const imgEl = element.querySelector("img") || element.querySelector("picture img");
       if (imgEl) {
-        const src = imgEl.getAttribute("src")?.trim();
-        if (src) {
-          const alt = imgEl.getAttribute("alt") || void 0;
-          let width;
-          let height;
-          const widthAttr = imgEl.getAttribute("width");
-          const heightAttr = imgEl.getAttribute("height");
-          if (widthAttr && !widthAttr.includes("%")) {
-            width = parseInt(widthAttr, 10) || void 0;
-          }
-          if (heightAttr && !heightAttr.includes("%")) {
-            height = parseInt(heightAttr, 10) || void 0;
-          }
-          let caption;
-          const figcaption = element.querySelector("figcaption");
-          if (figcaption) {
-            caption = getTextContent(figcaption).trim() || void 0;
-          }
-          elements.push({ type: "image", src, alt, width, height, caption });
+        const imageElement = createParsedImageElement(imgEl, nextImageKey());
+        if (imageElement) {
+          elements.push(imageElement);
           return;
         }
       }
@@ -73117,7 +73278,7 @@ function parseHtmlContent(html) {
       return;
     }
     if (isBlockquoteOrCallout(element, cssContext)) {
-      const content = parseBlockquoteContent(element, cssContext);
+      const content = parseBlockquoteContent(element, cssContext, nextImageKey);
       if (content.length > 0) {
         const elementStyles = getElementStyles(element, cssContext);
         let borderColor;
@@ -73695,35 +73856,83 @@ function createTableRow(cells, isHeaderRow, columnCount, cellPadding, headerBack
     tableHeader: isHeaderRow,
     children: cells.map(
       (cell, cellIndex) => {
-        const textRuns = typeof cell === "string" ? [new TextRun({
-          text: cell,
-          bold: isHeaderRow,
-          color: isHeaderRow && headerTextColor ? headerTextColor : void 0
-        })] : cell.map((run) => new TextRun({
-          text: run.text,
-          bold: isHeaderRow || run.bold,
-          italics: run.italic,
-          // Use header text color for header rows, otherwise use run's color
-          color: isHeaderRow && headerTextColor ? headerTextColor : run.color,
-          size: run.size,
-          font: run.fontFamily ? mapToOfficeFont(run.fontFamily) : void 0,
-          superScript: run.superscript,
-          subScript: run.subscript,
-          strike: run.strike,
-          characterSpacing: run.letterSpacing,
-          underline: run.underline ? {
-            type: getUnderlineType(run.underline.type),
-            color: run.underline.color
-          } : void 0,
-          // Preserve inline background colors for badge/pill styling in table cells
-          shading: run.backgroundColor ? {
-            type: ShadingType.CLEAR,
-            fill: run.backgroundColor,
-            color: "auto"
-          } : void 0
-        }));
+        let cellContent;
+        let cellBackgroundColor;
+        if (isComplexTableCell(cell)) {
+          cellContent = [];
+          for (const nestedElement of cell.content) {
+            cellContent.push(...convertElementToDocx(nestedElement));
+          }
+          if (cellContent.length === 0) {
+            cellContent = [new Paragraph({ children: [] })];
+          }
+        } else if (isStyledTableCell(cell)) {
+          cellBackgroundColor = cell.backgroundColor;
+          const content = cell.content;
+          const textRuns = typeof content === "string" ? [new TextRun({
+            text: content,
+            bold: isHeaderRow,
+            color: isHeaderRow && headerTextColor ? headerTextColor : void 0
+          })] : content.map((run) => new TextRun({
+            text: run.text,
+            bold: isHeaderRow || run.bold,
+            italics: run.italic,
+            color: isHeaderRow && headerTextColor ? headerTextColor : run.color,
+            size: run.size,
+            font: run.fontFamily ? mapToOfficeFont(run.fontFamily) : void 0,
+            superScript: run.superscript,
+            subScript: run.subscript,
+            strike: run.strike,
+            characterSpacing: run.letterSpacing,
+            underline: run.underline ? {
+              type: getUnderlineType(run.underline.type),
+              color: run.underline.color
+            } : void 0
+            // Note: Don't apply run-level backgroundColor here - cell background handles it
+          }));
+          cellContent = [new Paragraph({ children: textRuns })];
+        } else if (typeof cell === "string") {
+          const textRuns = [new TextRun({
+            text: cell,
+            bold: isHeaderRow,
+            color: isHeaderRow && headerTextColor ? headerTextColor : void 0
+          })];
+          cellContent = [new Paragraph({ children: textRuns })];
+        } else if (Array.isArray(cell)) {
+          const textRuns = cell.map((run) => new TextRun({
+            text: run.text,
+            bold: isHeaderRow || run.bold,
+            italics: run.italic,
+            color: isHeaderRow && headerTextColor ? headerTextColor : run.color,
+            size: run.size,
+            font: run.fontFamily ? mapToOfficeFont(run.fontFamily) : void 0,
+            superScript: run.superscript,
+            subScript: run.subscript,
+            strike: run.strike,
+            characterSpacing: run.letterSpacing,
+            underline: run.underline ? {
+              type: getUnderlineType(run.underline.type),
+              color: run.underline.color
+            } : void 0,
+            // Preserve inline background colors for badge/pill styling in table cells
+            shading: run.backgroundColor ? {
+              type: ShadingType.CLEAR,
+              fill: run.backgroundColor,
+              color: "auto"
+            } : void 0
+          }));
+          cellContent = [new Paragraph({ children: textRuns })];
+        } else {
+          cellContent = [new Paragraph({ children: [] })];
+        }
         let shading;
-        if (isHeaderRow && headerBackgroundColor) {
+        if (cellBackgroundColor) {
+          shading = {
+            type: ShadingType.CLEAR,
+            color: "auto",
+            fill: cellBackgroundColor
+          };
+        } else if (isHeaderRow && headerBackgroundColor) {
           shading = {
             type: ShadingType.CLEAR,
             color: "auto",
@@ -73741,11 +73950,7 @@ function createTableRow(cells, isHeaderRow, columnCount, cellPadding, headerBack
         const needsSpan = isLastCell && remainingColumns > 0;
         const cellColumnSpan = needsSpan ? remainingColumns + 1 : void 0;
         return new TableCell({
-          children: [
-            new Paragraph({
-              children: textRuns
-            })
-          ],
+          children: cellContent,
           width: {
             size: columnWidths?.[cellIndex] ?? 100 / columnCount,
             type: WidthType.PERCENTAGE
@@ -74074,6 +74279,15 @@ function convertElementToDocx(element) {
               const cell = row[cellIndex];
               if (typeof cell === "string") {
                 children.push(new TextRun({ text: cell }));
+              } else if (isStyledTableCell(cell)) {
+                const content = cell.content;
+                if (typeof content === "string") {
+                  children.push(new TextRun({ text: content }));
+                } else {
+                  children.push(...inlineRunsToTextRuns(content));
+                }
+              } else if (isComplexTableCell(cell)) {
+                continue;
               } else {
                 children.push(...inlineRunsToTextRuns(cell));
               }
@@ -74520,8 +74734,14 @@ function createDocxDocument(html, options = {}) {
   if (imageMap && imageMap.size > 0) {
     let populateImageData2 = function(elements) {
       for (const element of elements) {
-        if (element.type === "image" && !element.imageData && imageMap.has(element.src)) {
-          element.imageData = imageMap.get(element.src);
+        if (element.type === "image" && !element.imageData) {
+          const lookupKeys = [element.imageKey, element.src].filter((key2) => Boolean(key2));
+          for (const lookupKey of lookupKeys) {
+            if (imageMap.has(lookupKey)) {
+              element.imageData = imageMap.get(lookupKey);
+              break;
+            }
+          }
         }
         if (element.type === "blockquote" && element.content) {
           populateImageData2(element.content);
@@ -74888,6 +75108,50 @@ function parseImageDimensions(data) {
   }
   return null;
 }
+function parseDataUriImages(htmlContent) {
+  const imageMap = /* @__PURE__ */ new Map();
+  const dataUriRegex = /<img\s+[^>]*src="\s*(data:image\/[^;]+;base64,[^"]+)\s*"[^>]*>/gi;
+  const matches2 = [...htmlContent.matchAll(dataUriRegex)];
+  if (matches2.length === 0) {
+    return imageMap;
+  }
+  const dataUris = /* @__PURE__ */ new Set();
+  for (const match of matches2) {
+    dataUris.add(match[1]);
+  }
+  console.log(`Processing ${dataUris.size} inline base64 image(s)...`);
+  for (const dataUri of dataUris) {
+    try {
+      const commaIndex = dataUri.indexOf(",");
+      if (commaIndex === -1) {
+        console.warn(`Invalid data URI format`);
+        continue;
+      }
+      const base64Data = dataUri.slice(commaIndex + 1);
+      const buffer2 = Buffer.from(base64Data, "base64");
+      const data = new Uint8Array(buffer2);
+      const dimensions = parseImageDimensions(data);
+      if (!dimensions) {
+        console.warn(`Could not parse dimensions for data URI image`);
+        continue;
+      }
+      let { width, height } = dimensions;
+      if (width > MAX_IMAGE_WIDTH) {
+        const scale = MAX_IMAGE_WIDTH / width;
+        width = MAX_IMAGE_WIDTH;
+        height = Math.round(height * scale);
+      }
+      imageMap.set(dataUri, {
+        data: buffer2,
+        width,
+        height
+      });
+    } catch {
+      console.warn(`Failed to parse data URI image`);
+    }
+  }
+  return imageMap;
+}
 async function fetchExternalImages(htmlContent) {
   const imageMap = /* @__PURE__ */ new Map();
   const imgRegex = /<img\s+[^>]*src="\s*(https?:\/\/[^"]+?)\s*"[^>]*>/gi;
@@ -74931,14 +75195,87 @@ async function fetchExternalImages(htmlContent) {
   );
   return imageMap;
 }
-async function renderChartImages(browser2, htmlPath) {
+async function renderHtmlImages(browser2, htmlPath, elements) {
+  const renderedImages = /* @__PURE__ */ new Map();
+  const absoluteHtmlPath = path3.resolve(htmlPath);
+  if (!fs3.existsSync(absoluteHtmlPath)) {
+    return renderedImages;
+  }
+  const htmlImageElements = [];
+  function collectImages(els) {
+    for (const el of els) {
+      if (el.type === "image") {
+        htmlImageElements.push(el);
+      } else if (el.type === "blockquote" && el.content) {
+        collectImages(el.content);
+      } else if (el.type === "two-column-layout") {
+        collectImages(el.sidebar.content);
+        collectImages(el.main.content);
+      }
+    }
+  }
+  collectImages(elements);
+  if (htmlImageElements.length === 0) {
+    return renderedImages;
+  }
+  console.log(`Rendering ${htmlImageElements.length} HTML image(s)...`);
+  const page = await browser2.newPage({
+    viewport: { width: 1200, height: 800 }
+  });
+  try {
+    await page.goto(`file://${absoluteHtmlPath}`, {
+      waitUntil: "networkidle"
+    });
+    await page.waitForTimeout(500);
+    const domImageCount = await page.evaluate(() => {
+      let imageIndex = 0;
+      for (const img of Array.from(document.querySelectorAll("img"))) {
+        const src = img.getAttribute("src")?.trim();
+        if (!src) {
+          continue;
+        }
+        img.setAttribute("data-docgen-image-index", String(imageIndex));
+        imageIndex++;
+      }
+      return imageIndex;
+    });
+    if (domImageCount !== htmlImageElements.length) {
+      console.warn(`HTML image count mismatch: parsed ${htmlImageElements.length}, DOM ${domImageCount}`);
+    }
+    for (let i = 0; i < htmlImageElements.length; i++) {
+      const imageElement = htmlImageElements[i];
+      if (!imageElement.imageKey) {
+        continue;
+      }
+      const imgEl = await page.$(`img[data-docgen-image-index="${i}"]`);
+      if (!imgEl) {
+        continue;
+      }
+      const box = await imgEl.boundingBox();
+      if (!box || box.width < 1 || box.height < 1) {
+        continue;
+      }
+      const screenshot = await imgEl.screenshot({
+        type: "png"
+      });
+      const scale = box.width > MAX_IMAGE_WIDTH ? MAX_IMAGE_WIDTH / box.width : 1;
+      renderedImages.set(imageElement.imageKey, {
+        data: screenshot,
+        width: Math.round(box.width * scale),
+        height: Math.round(box.height * scale)
+      });
+    }
+  } finally {
+    await page.close();
+  }
+  return renderedImages;
+}
+async function renderChartImages(browser2, htmlPath, elements) {
   const chartImages = /* @__PURE__ */ new Map();
   const absoluteHtmlPath = path3.resolve(htmlPath);
   if (!fs3.existsSync(absoluteHtmlPath)) {
     return chartImages;
   }
-  const htmlContent = fs3.readFileSync(absoluteHtmlPath, "utf-8");
-  const elements = parseHtmlContent(htmlContent);
   const svgChartElements = [];
   function collectSvgCharts(els) {
     for (const el of els) {
@@ -75050,21 +75387,32 @@ async function exportDocs(filePath, outDir, options = {}) {
   }
   console.log(`Exporting to DOCX: ${filePath}`);
   const html = fs3.readFileSync(absolutePath, "utf-8");
+  const elements = parseHtmlContent(html);
   const baseName = outputName || path3.basename(filePath, ".html");
   const imageMap = await fetchExternalImages(html);
+  const dataUriImages = parseDataUriImages(html);
+  for (const [uri2, data] of dataUriImages) {
+    imageMap.set(uri2, data);
+  }
   const launchOptions = { headless: true };
   const proxyServer = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
   if (proxyServer) {
     launchOptions.proxy = { server: proxyServer };
   }
   const browser2 = await chromium.launch(launchOptions);
+  let renderedImages;
   let chartImages;
   try {
-    chartImages = await renderChartImages(browser2, absolutePath);
+    [renderedImages, chartImages] = await Promise.all([
+      renderHtmlImages(browser2, absolutePath, elements),
+      renderChartImages(browser2, absolutePath, elements)
+    ]);
   } finally {
     await browser2.close();
   }
-  const elements = parseHtmlContent(html);
+  for (const [imageKey, data] of renderedImages) {
+    imageMap.set(imageKey, data);
+  }
   const buffer2 = await createDocxBuffer(html, {
     title: baseName,
     elements,