@bendyline/squisq-formats 2.0.1 → 2.2.0

package/dist/{chunk-CRAVSMPZ.js → chunk-26ISNJ7Y.js}

@@ -1,21 +1,26 @@
 import {
+  RelIdAllocator,
   inlineNodeToRuns,
-  inlineNodesToRuns
-} from "./chunk-6M7Z25LA.js";
+  inlineNodesToRuns,
+  normalizeOoxmlHex,
+  sanitizeOfficeHyperlink
+} from "./chunk-GX7RAUME.js";
 import {
   stripHtmlTags
-} from "./chunk-PN52A5AA.js";
+} from "./chunk-SBUW7NHR.js";
 import {
   createPackage
-} from "./chunk-U32AG3G3.js";
+} from "./chunk-4V3KCHAP.js";
 import {
   escapeXml,
   xmlDeclaration
-} from "./chunk-U4MRIFKL.js";
+} from "./chunk-JU2RHXUB.js";
 import {
   CONTENT_TYPE_DOCX_DOCUMENT,
   CONTENT_TYPE_DOCX_FONT_TABLE,
+  CONTENT_TYPE_DOCX_FOOTER,
   CONTENT_TYPE_DOCX_FOOTNOTES,
+  CONTENT_TYPE_DOCX_HEADER,
   CONTENT_TYPE_DOCX_NUMBERING,
   CONTENT_TYPE_DOCX_SETTINGS,
   CONTENT_TYPE_DOCX_STYLES,
@@ -23,24 +28,29 @@ import {
   NS_R,
   NS_WML,
   REL_FONT_TABLE,
+  REL_FOOTER,
   REL_FOOTNOTES,
+  REL_HEADER,
   REL_HYPERLINK,
   REL_IMAGE,
   REL_NUMBERING,
   REL_OFFICE_DOCUMENT,
   REL_SETTINGS,
   REL_STYLES,
+  baseDirOf,
   getPartBinary,
   getPartRelationships,
   getPartXml,
-  openPackage
-} from "./chunk-WC7WULGV.js";
+  openPackage,
+  requireMainPartPath,
+  resolveTarget
+} from "./chunk-X2DEAXNK.js";
 import {
   buildContainer
-} from "./chunk-SSUPBUF5.js";
+} from "./chunk-IIQYS2YH.js";
 import {
   extToMime
-} from "./chunk-O3GVVND4.js";
+} from "./chunk-AONELFLA.js";
 
 // src/docx/export.ts
 import { resolveFontFamily } from "@bendyline/squisq/schemas";
@@ -103,10 +113,31 @@ function pointsToTwips(points) {
 
 // src/docx/export.ts
 async function markdownDocToDocx(doc, options = {}) {
+  options.signal?.throwIfAborted();
   const resolvedOptions = options.themeId !== void 0 ? options : { ...options, themeId: readFrontmatterThemeId(doc.frontmatter) };
   const ctx = new ExportContext(resolvedOptions, doc);
-  const bodyXml = convertBlocks(doc.children, ctx);
-  return buildDocxPackage(bodyXml, ctx, resolvedOptions);
+  const stories = partitionDocumentStories(doc.children);
+  ctx.setRelationshipSource("document");
+  const bodyXml = convertBlocks(stories.body, ctx);
+  ctx.setRelationshipSource("header");
+  const headerXml = convertBlocks(stories.header, ctx);
+  ctx.setRelationshipSource("footer");
+  const footerXml = convertBlocks(stories.footer, ctx);
+  ctx.setRelationshipSource("document");
+  return buildDocxPackage(bodyXml, headerXml, footerXml, ctx, resolvedOptions);
+}
+function partitionDocumentStories(nodes) {
+  const stories = { body: [], header: [], footer: [] };
+  for (const node of nodes) {
+    if (node.type === "containerDirective" && node.name === "docx-header") {
+      stories.header.push(...node.children);
+    } else if (node.type === "containerDirective" && node.name === "docx-footer") {
+      stories.footer.push(...node.children);
+    } else {
+      stories.body.push(node);
+    }
+  }
+  return stories;
 }
 async function docToDocx(doc, options = {}) {
   const markdownDoc = docToMarkdown(doc);
@@ -114,12 +145,20 @@ async function docToDocx(doc, options = {}) {
 }
 var ExportContext = class {
   constructor(options, doc) {
-    this.nextRelId = 1;
+    /**
+     * One id source per rels part — see `RelIdAllocator`. Hyperlink, image AND
+     * fixed (styles/numbering/settings/…) rels all draw from this, keyed by the
+     * story part they belong to, so `word/_rels/document.xml.rels` cannot
+     * contain a duplicate `Id` no matter how many hyperlinks/images a document
+     * has.
+     */
+    this.relIds = new RelIdAllocator();
     this.nextNumId = 1;
     this.nextFootnoteId = 1;
     // 0 is separator, start user footnotes at 1
     /** Relationships for word/_rels/document.xml.rels */
     this.relationships = [];
+    this.relationshipSource = "document";
     /** Numbering definitions (abstract + num) */
     this.numberingDefs = [];
     /** Footnote XML bodies (keyed by footnote id) */
@@ -143,11 +182,10 @@ var ExportContext = class {
       const theme = resolveThemeForDoc(doc, options.themeId, options.themeRegistry);
       themeFont = firstFontFromStack(resolveFontFamily(theme.typography?.bodyFont, ""));
       themeTitleFont = firstFontFromStack(resolveFontFamily(theme.typography?.titleFont, ""));
-      const stripHash = (c) => c.startsWith("#") ? c.slice(1) : c;
-      if (theme.colors?.primary) themeHeadingColor = stripHash(theme.colors.primary);
-      if (theme.colors?.text) themeBodyColor = stripHash(theme.colors.text);
-      if (theme.colors?.textMuted) themeMutedColor = stripHash(theme.colors.textMuted);
-      if (theme.colors?.background) themeBackgroundColor = stripHash(theme.colors.background);
+      themeHeadingColor = normalizeOoxmlHex(theme.colors?.primary);
+      themeBodyColor = normalizeOoxmlHex(theme.colors?.text);
+      themeMutedColor = normalizeOoxmlHex(theme.colors?.textMuted);
+      themeBackgroundColor = normalizeOoxmlHex(theme.colors?.background);
     }
     this.font = options.defaultFont ?? themeFont ?? DEFAULT_FONT;
     this.headingFont = themeTitleFont ?? this.font;
@@ -157,19 +195,33 @@ var ExportContext = class {
     this.mutedColor = themeMutedColor;
     this.backgroundColor = themeBackgroundColor;
     this.resolvedImages = options.images ?? /* @__PURE__ */ new Map();
+    this.allowRelativeHyperlinks = options.allowRelativeHyperlinks ?? false;
+    this.signal = options.signal;
   }
-  /** Allocate a new relationship ID */
+  /** Allocate a relationship ID on the story part currently being converted. */
   allocRelId() {
-    return `rId${this.nextRelId++}`;
+    return this.allocRelIdFor(this.relationshipSource);
+  }
+  /** Allocate a relationship ID on a specific story part. */
+  allocRelIdFor(source) {
+    return this.relIds.alloc(docxStoryPartPath(source));
+  }
+  setRelationshipSource(source) {
+    this.relationshipSource = source;
   }
   /** Add a hyperlink relationship and return the rId */
   addHyperlink(url) {
+    const target = sanitizeOfficeHyperlink(url, {
+      allowRelative: this.allowRelativeHyperlinks
+    });
+    if (!target) return null;
     const id = this.allocRelId();
     this.relationships.push({
       id,
       type: REL_HYPERLINK,
-      target: url,
-      targetMode: "External"
+      target,
+      targetMode: "External",
+      source: this.relationshipSource
     });
     return id;
   }
@@ -182,7 +234,8 @@ var ExportContext = class {
     this.relationships.push({
       id: relId,
       type: REL_IMAGE,
-      target: `media/${filename}`
+      target: `media/${filename}`,
+      source: this.relationshipSource
     });
     return { relId, docPrId };
   }
@@ -204,6 +257,11 @@ var ExportContext = class {
     return id;
   }
 };
+function docxStoryPartPath(source) {
+  if (source === "header") return "word/header1.xml";
+  if (source === "footer") return "word/footer1.xml";
+  return "word/document.xml";
+}
 function firstFontFromStack(stack) {
   if (!stack) return "";
   const generics = /* @__PURE__ */ new Set([
@@ -230,7 +288,9 @@ function firstFontFromStack(stack) {
 }
 function convertBlocks(nodes, ctx) {
   const parts = [];
-  for (const node of nodes) {
+  for (let index = 0; index < nodes.length; index++) {
+    if ((index & 255) === 0) ctx.signal?.throwIfAborted();
+    const node = nodes[index];
     parts.push(convertBlock(node, ctx, 0));
   }
   return parts.join("");
@@ -257,6 +317,8 @@ function convertBlock(node, ctx, listDepth) {
       return convertMathBlock(node);
     case "footnoteDefinition":
       return convertFootnoteDefinition(node, ctx);
+    case "containerDirective":
+      return convertBlocks(node.children, ctx);
     default:
       return "";
   }
@@ -390,21 +452,20 @@ function convertInline(node, ctx, format) {
 function makeRun(text, format) {
   if (!text) return "";
   const rPrParts = [];
+  if (format.code) {
+    rPrParts.push(`<w:rFonts w:ascii="${DEFAULT_CODE_FONT}" w:hAnsi="${DEFAULT_CODE_FONT}"/>`);
+  }
   if (format.bold) rPrParts.push("<w:b/>");
   if (format.italic) rPrParts.push("<w:i/>");
   if (format.strike) rPrParts.push("<w:strike/>");
   if (format.color) rPrParts.push(`<w:color w:val="${format.color}"/>`);
-  if (format.code) {
-    rPrParts.push(
-      `<w:rFonts w:ascii="${DEFAULT_CODE_FONT}" w:hAnsi="${DEFAULT_CODE_FONT}"/>`,
-      `<w:sz w:val="${DEFAULT_CODE_FONT_SIZE}"/>`
-    );
-  }
+  if (format.code) rPrParts.push(`<w:sz w:val="${DEFAULT_CODE_FONT_SIZE}"/>`);
   const rPr = rPrParts.length > 0 ? `<w:rPr>${rPrParts.join("")}</w:rPr>` : "";
   return `<w:r>${rPr}<w:t xml:space="preserve">${escapeXml(text)}</w:t></w:r>`;
 }
 function convertLink(node, ctx, format) {
   const rId = ctx.addHyperlink(node.url);
+  if (!rId) return convertInlines(node.children, ctx, format);
   const styledRuns = convertInlinesWithHyperlinkStyle(node.children, ctx, format);
   return `<w:hyperlink r:id="${rId}">${styledRuns}</w:hyperlink>`;
 }
@@ -421,13 +482,10 @@ function convertInlinesWithHyperlinkStyle(nodes, ctx, format) {
 }
 function makeHyperlinkRun(text, format) {
   if (!text) return "";
-  const rPrParts = [
-    '<w:rStyle w:val="Hyperlink"/>',
-    `<w:color w:val="${HYPERLINK_COLOR}"/>`,
-    '<w:u w:val="single"/>'
-  ];
+  const rPrParts = ['<w:rStyle w:val="Hyperlink"/>'];
   if (format.bold) rPrParts.push("<w:b/>");
   if (format.italic) rPrParts.push("<w:i/>");
+  rPrParts.push(`<w:color w:val="${HYPERLINK_COLOR}"/>`, '<w:u w:val="single"/>');
   return `<w:r><w:rPr>${rPrParts.join("")}</w:rPr><w:t xml:space="preserve">${escapeXml(text)}</w:t></w:r>`;
 }
 function convertImage(node, ctx) {
@@ -498,16 +556,25 @@ function convertFootnoteRef(node, ctx) {
   const fnId = ctx.getFootnoteId(node.identifier);
   return `<w:r><w:rPr><w:rStyle w:val="FootnoteReference"/><w:vertAlign w:val="superscript"/></w:rPr><w:footnoteReference w:id="${fnId}"/></w:r>`;
 }
-async function buildDocxPackage(bodyXml, ctx, options) {
+async function buildDocxPackage(bodyXml, headerXml, footerXml, ctx, options) {
   const pkg = createPackage();
-  let relCounter = 100;
-  const stylesRelId = `rId${relCounter++}`;
-  const numberingRelId = `rId${relCounter++}`;
-  const settingsRelId = `rId${relCounter++}`;
-  const fontTableRelId = `rId${relCounter++}`;
-  const footnotesRelId = `rId${relCounter++}`;
-  const documentXml = buildDocumentXml(bodyXml, ctx.backgroundColor);
+  const hasHeader = headerXml.trim().length > 0;
+  const hasFooter = footerXml.trim().length > 0;
+  const stylesRelId = ctx.allocRelIdFor("document");
+  const settingsRelId = ctx.allocRelIdFor("document");
+  const fontTableRelId = ctx.allocRelIdFor("document");
+  const numberingRelId = ctx.hasLists ? ctx.allocRelIdFor("document") : void 0;
+  const footnotesRelId = ctx.hasFootnotes ? ctx.allocRelIdFor("document") : void 0;
+  const headerRelId = hasHeader ? ctx.allocRelIdFor("document") : void 0;
+  const footerRelId = hasFooter ? ctx.allocRelIdFor("document") : void 0;
+  const documentXml = buildDocumentXml(bodyXml, ctx.backgroundColor, headerRelId, footerRelId);
   pkg.addPart("word/document.xml", documentXml, CONTENT_TYPE_DOCX_DOCUMENT);
+  if (hasHeader) {
+    pkg.addPart("word/header1.xml", buildStoryXml("header", headerXml), CONTENT_TYPE_DOCX_HEADER);
+  }
+  if (hasFooter) {
+    pkg.addPart("word/footer1.xml", buildStoryXml("footer", footerXml), CONTENT_TYPE_DOCX_FOOTER);
+  }
   const stylesXml = buildStylesXml(options, ctx);
   pkg.addPart("word/styles.xml", stylesXml, CONTENT_TYPE_DOCX_STYLES);
   const settingsXml = buildSettingsXml(ctx.backgroundColor !== void 0);
@@ -542,22 +609,36 @@ async function buildDocxPackage(bodyXml, ctx, options) {
     type: REL_FONT_TABLE,
     target: "fontTable.xml"
   });
-  if (ctx.hasLists) {
+  if (numberingRelId) {
     pkg.addRelationship("word/document.xml", {
       id: numberingRelId,
       type: REL_NUMBERING,
       target: "numbering.xml"
     });
   }
-  if (ctx.hasFootnotes) {
+  if (footnotesRelId) {
     pkg.addRelationship("word/document.xml", {
       id: footnotesRelId,
       type: REL_FOOTNOTES,
       target: "footnotes.xml"
     });
   }
-  for (const rel of ctx.relationships) {
+  if (headerRelId) {
+    pkg.addRelationship("word/document.xml", {
+      id: headerRelId,
+      type: REL_HEADER,
+      target: "header1.xml"
+    });
+  }
+  if (footerRelId) {
     pkg.addRelationship("word/document.xml", {
+      id: footerRelId,
+      type: REL_FOOTER,
+      target: "footer1.xml"
+    });
+  }
+  for (const rel of ctx.relationships) {
+    pkg.addRelationship(docxStoryPartPath(rel.source), {
       id: rel.id,
       type: rel.type,
       target: rel.target,
@@ -578,9 +659,14 @@ async function buildDocxPackage(bodyXml, ctx, options) {
   }
   return pkg.toArrayBuffer();
 }
-function buildDocumentXml(bodyXml, backgroundColor) {
+function buildDocumentXml(bodyXml, backgroundColor, headerRelId, footerRelId) {
   const backgroundEl = backgroundColor ? `<w:background w:color="${backgroundColor}"/>` : "";
-  return xmlDeclaration() + `<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="${NS_MC}" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="${NS_R}" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="${NS_WML}" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml">` + backgroundEl + `<w:body>` + bodyXml + `<w:sectPr><w:pgSz w:w="12240" w:h="15840"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/><w:cols w:space="720"/></w:sectPr></w:body></w:document>`;
+  const storyReferences = (headerRelId ? `<w:headerReference w:type="default" r:id="${headerRelId}"/>` : "") + (footerRelId ? `<w:footerReference w:type="default" r:id="${footerRelId}"/>` : "");
+  return xmlDeclaration() + `<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="${NS_MC}" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="${NS_R}" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="${NS_WML}" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml">` + backgroundEl + `<w:body>` + bodyXml + `<w:sectPr>` + storyReferences + `<w:pgSz w:w="12240" w:h="15840"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/><w:cols w:space="720"/></w:sectPr></w:body></w:document>`;
+}
+function buildStoryXml(kind, bodyXml) {
+  const element = kind === "header" ? "hdr" : "ftr";
+  return xmlDeclaration() + `<w:${element} xmlns:w="${NS_WML}" xmlns:r="${NS_R}" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing">` + bodyXml + `</w:${element}>`;
 }
 function buildStylesXml(options, ctx) {
   const font = ctx.font;
@@ -655,18 +741,20 @@ function buildFootnotesXml(ctx) {
 // src/docx/import.ts
 import { markdownToDoc } from "@bendyline/squisq/doc";
 import { stringifyMarkdown } from "@bendyline/squisq/markdown";
+var DOCX_MAIN_PART = "word/document.xml";
 async function docxToMarkdownDoc(data, options = {}) {
   const pkg = await openPackage(data, options);
-  const ctx = await buildImportContext(pkg, options);
-  const documentXml = await getPartXml(pkg, "word/document.xml");
+  const mainPart = requireMainPartPath(pkg, DOCX_MAIN_PART, "DOCX");
+  const ctx = await buildImportContext(pkg, options, mainPart);
+  const documentXml = await getPartXml(pkg, mainPart);
   if (!documentXml) {
-    return { type: "document", children: [] };
+    throw new Error(`Invalid DOCX package: main document part "${mainPart}" could not be parsed.`);
   }
   const body = getFirstElement(documentXml, "body");
   if (!body) {
     return { type: "document", children: [] };
   }
-  const blocks = await convertBody(body, ctx);
+  const blocks = await convertDocumentStories(body, ctx);
   return { type: "document", children: blocks };
 }
 async function docxToDoc(data, options = {}) {
@@ -675,16 +763,19 @@ async function docxToDoc(data, options = {}) {
 }
 async function docxToContainer(data, options = {}) {
   const pkg = await openPackage(data, options);
-  const ctx = await buildImportContext(pkg, { ...options, extractImages: true });
-  const documentXml = await getPartXml(pkg, "word/document.xml");
-  if (!documentXml) return buildContainer("", []);
+  const mainPart = requireMainPartPath(pkg, DOCX_MAIN_PART, "DOCX");
+  const ctx = await buildImportContext(pkg, { ...options, extractImages: true }, mainPart);
+  const documentXml = await getPartXml(pkg, mainPart);
+  if (!documentXml) {
+    throw new Error(`Invalid DOCX package: main document part "${mainPart}" could not be parsed.`);
+  }
   const body = getFirstElement(documentXml, "body");
   if (!body) return buildContainer("", []);
-  const blocks = await convertBody(body, ctx);
+  const blocks = await convertDocumentStories(body, ctx);
   const markdownDoc = { type: "document", children: blocks };
   return buildContainer(stringifyMarkdown(markdownDoc), ctx.extractedImages);
 }
-async function buildImportContext(pkg, options) {
+async function buildImportContext(pkg, options, mainPartPath = DOCX_MAIN_PART) {
   const ctx = {
     headingStyles: /* @__PURE__ */ new Map(),
     quoteStyles: /* @__PURE__ */ new Set(),
@@ -693,6 +784,9 @@ async function buildImportContext(pkg, options) {
     documentRels: /* @__PURE__ */ new Map(),
     numbering: /* @__PURE__ */ new Map(),
     footnotes: /* @__PURE__ */ new Map(),
+    endnotes: /* @__PURE__ */ new Map(),
+    currentPartPath: mainPartPath,
+    mainPartPath,
     pkg,
     options,
     extractedImages: /* @__PURE__ */ new Map(),
@@ -711,12 +805,13 @@ async function buildImportContext(pkg, options) {
     ctx.inlineCodeStyles.add(id);
   }
   await parseStyles(pkg, ctx);
-  const rels = await getPartRelationships(pkg, "word/document.xml");
+  const rels = await getPartRelationships(pkg, mainPartPath);
   for (const rel of rels) {
     ctx.documentRels.set(rel.id, rel);
   }
   await parseNumbering(pkg, ctx);
   await parseFootnotes(pkg, ctx);
+  await parseEndnotes(pkg, ctx);
   return ctx;
 }
 async function parseStyles(pkg, ctx) {
@@ -797,9 +892,67 @@ async function parseFootnotes(pkg, ctx) {
     ctx.footnotes.set(id, fn);
   }
 }
+async function parseEndnotes(pkg, ctx) {
+  const doc = await getPartXml(pkg, "word/endnotes.xml");
+  if (!doc) return;
+  const endnoteEls = getAllElements(doc, "endnote");
+  for (const note of endnoteEls) {
+    const id = getAttr(note, "id");
+    const type = getAttr(note, "type");
+    if (!id || type === "separator" || type === "continuationSeparator") continue;
+    ctx.endnotes.set(id, note);
+  }
+}
+async function convertDocumentStories(body, ctx) {
+  const bodyBlocks = await convertBody(body, ctx);
+  const headers = await convertRelatedStories(body, ctx, "header");
+  const footers = await convertRelatedStories(body, ctx, "footer");
+  const noteDefinitions = await convertNoteDefinitions(ctx);
+  return [...bodyBlocks, ...headers, ...footers, ...noteDefinitions];
+}
+async function convertRelatedStories(body, ctx, kind) {
+  const relationshipTypeSuffix = `/${kind}`;
+  const referenceName = `${kind}Reference`;
+  const referenceTypes = /* @__PURE__ */ new Map();
+  for (const reference of getAllElements(body, referenceName)) {
+    const id = reference.getAttributeNS(NS_R, "id") ?? reference.getAttribute("r:id");
+    if (id) referenceTypes.set(id, getAttr(reference, "type") ?? "default");
+  }
+  const documentRelationships = ctx.documentRels;
+  const previousPartPath = ctx.currentPartPath;
+  const results = [];
+  for (const relationship of documentRelationships.values()) {
+    if (!relationship.type.endsWith(relationshipTypeSuffix)) continue;
+    const partPath = resolveTarget(baseDirOf(ctx.mainPartPath), relationship.target);
+    const part = await getPartXml(ctx.pkg, partPath);
+    if (!part?.documentElement) continue;
+    const partRelationships = await getPartRelationships(ctx.pkg, partPath);
+    ctx.documentRels = new Map(partRelationships.map((rel) => [rel.id, rel]));
+    ctx.currentPartPath = partPath;
+    try {
+      const children = await convertBody(part.documentElement, ctx);
+      if (children.length === 0) continue;
+      results.push({
+        type: "containerDirective",
+        name: `docx-${kind}`,
+        attributes: {
+          type: referenceTypes.get(relationship.id) ?? "default",
+          source: partPath
+        },
+        children
+      });
+    } finally {
+      ctx.documentRels = documentRelationships;
+      ctx.currentPartPath = previousPartPath;
+    }
+  }
+  return results;
+}
 async function convertBody(body, ctx) {
+  return convertBlockElements(Array.from(body.children), ctx);
+}
+async function convertBlockElements(children, ctx) {
   const result = [];
-  const children = Array.from(body.children);
   let i = 0;
   while (i < children.length) {
     const el = children[i];
@@ -821,12 +974,22 @@ async function convertBody(body, ctx) {
       const table = await convertTable2(el, ctx);
       if (table) result.push(table);
       i++;
+    } else if (localName === "sdt") {
+      const content = getFirstChildElement(el, "sdtContent");
+      if (content) result.push(...await convertBlockElements(Array.from(content.children), ctx));
+      i++;
+    } else if (localName === "ins" || localName === "moveTo" || localName === "customXml" || localName === "smartTag" || localName === "fldSimple") {
+      result.push(...await convertBlockElements(Array.from(el.children), ctx));
+      i++;
+    } else if (localName === "AlternateContent") {
+      const selected = getFirstChildElement(el, "Choice") ?? getFirstChildElement(el, "Fallback");
+      if (selected)
+        result.push(...await convertBlockElements(Array.from(selected.children), ctx));
+      i++;
     } else {
       i++;
     }
   }
-  const footnoteNodes = await convertFootnoteDefinitions(ctx);
-  result.push(...footnoteNodes);
   return result;
 }
 async function convertParagraph2(el, ctx) {
@@ -857,8 +1020,10 @@ async function convertParagraph2(el, ctx) {
   return { type: "paragraph", children: inlines };
 }
 async function convertRuns(paragraphEl, ctx) {
+  return mergeAdjacentText(await convertInlineElements(Array.from(paragraphEl.children), ctx));
+}
+async function convertInlineElements(children, ctx) {
   const result = [];
-  const children = Array.from(paragraphEl.children);
   for (const child of children) {
     const localName = child.localName;
     if (localName === "r") {
@@ -867,9 +1032,23 @@ async function convertRuns(paragraphEl, ctx) {
     } else if (localName === "hyperlink") {
       const link = await convertHyperlink(child, ctx);
       if (link) result.push(link);
+    } else if (localName === "sdt") {
+      const content = getFirstChildElement(child, "sdtContent");
+      if (content) {
+        result.push(...await convertInlineElements(Array.from(content.children), ctx));
+      }
+    } else if (localName === "ins" || localName === "moveTo" || localName === "customXml" || localName === "smartTag" || localName === "fldSimple") {
+      result.push(...await convertInlineElements(Array.from(child.children), ctx));
+    } else if (localName === "AlternateContent") {
+      const selected = getFirstChildElement(child, "Choice") ?? getFirstChildElement(child, "Fallback");
+      if (selected) {
+        result.push(...await convertInlineElements(Array.from(selected.children), ctx));
+      }
+    } else if (localName === "drawing" || localName === "pict") {
+      result.push(...await convertDrawingContent(child, ctx));
     }
   }
-  return mergeAdjacentText(result);
+  return result;
 }
 async function convertRun(runEl, ctx) {
   const result = [];
@@ -895,8 +1074,10 @@ async function convertRun(runEl, ctx) {
         }
         result.push(node);
       }
-    } else if (localName === "br") {
+    } else if (localName === "br" || localName === "cr") {
       result.push({ type: "break" });
+    } else if (localName === "tab") {
+      result.push({ type: "text", value: " " });
     } else if (localName === "footnoteReference") {
       const fnId = getAttr(child, "id");
       if (fnId && fnId !== "0" && fnId !== "-1") {
@@ -905,13 +1086,79 @@ async function convertRun(runEl, ctx) {
           identifier: `fn${fnId}`
         });
       }
-    } else if (localName === "drawing" || localName === "pict") {
-      const img = await extractImage(child, ctx);
-      if (img) result.push(img);
+    } else if (localName === "endnoteReference") {
+      const noteId = getAttr(child, "id");
+      if (noteId && noteId !== "0" && noteId !== "-1") {
+        result.push({
+          type: "footnoteReference",
+          identifier: `endnote${noteId}`
+        });
+      }
+    } else if (localName === "drawing" || localName === "pict" || localName === "object") {
+      result.push(...await convertDrawingContent(child, ctx));
+    } else if (localName === "AlternateContent") {
+      const selected = getFirstChildElement(child, "Choice") ?? getFirstChildElement(child, "Fallback");
+      if (selected) {
+        result.push(...await convertInlineElements(Array.from(selected.children), ctx));
+      }
+    }
+  }
+  return result;
+}
+async function convertDrawingContent(el, ctx) {
+  const result = [];
+  const textBoxes = findDescendants(el, "txbxContent");
+  for (const textBox of textBoxes) {
+    const inlines = await flattenContainerToInlines(textBox, ctx);
+    appendInlineGroup(result, inlines);
+  }
+  const image = await extractImage(el, ctx);
+  if (image) result.push(image);
+  if (textBoxes.length > 0 && result.length > 0) {
+    if (result[0]?.type !== "break") result.unshift({ type: "break" });
+    if (result[result.length - 1]?.type !== "break") {
+      result.push({ type: "break" });
     }
   }
   return result;
 }
+async function flattenContainerToInlines(container, ctx) {
+  const result = [];
+  for (const child of Array.from(container.children)) {
+    if (child.localName === "p") {
+      appendInlineGroup(result, await convertRuns(child, ctx));
+    } else if (child.localName === "tbl") {
+      appendInlineGroup(result, await flattenTableToInlines(child, ctx));
+    } else if (child.localName === "sdt") {
+      const content = getFirstChildElement(child, "sdtContent");
+      if (content) appendInlineGroup(result, await flattenContainerToInlines(content, ctx));
+    } else if (child.localName === "ins" || child.localName === "moveTo" || child.localName === "customXml" || child.localName === "smartTag" || child.localName === "fldSimple") {
+      appendInlineGroup(result, await flattenContainerToInlines(child, ctx));
+    } else if (child.localName === "AlternateContent") {
+      const selected = getFirstChildElement(child, "Choice") ?? getFirstChildElement(child, "Fallback");
+      if (selected) appendInlineGroup(result, await flattenContainerToInlines(selected, ctx));
+    } else if (child.localName === "r" || child.localName === "hyperlink") {
+      appendInlineGroup(result, await convertInlineElements([child], ctx));
+    }
+  }
+  return mergeAdjacentText(result);
+}
+async function flattenTableToInlines(table, ctx) {
+  const result = [];
+  for (const row of getAllChildElements(table, "tr")) {
+    for (const cell of getAllChildElements(row, "tc")) {
+      appendInlineGroup(result, await flattenContainerToInlines(cell, ctx));
+    }
+  }
+  return mergeAdjacentText(result);
+}
+function appendInlineGroup(target, group) {
+  if (group.length === 0) return;
+  if (target.length > 0 && target[target.length - 1]?.type !== "break") {
+    target.push({ type: "break" });
+  }
+  target.push(...group);
+}
 function parseRunFormat(rPr, ctx) {
   if (!rPr) return { bold: false, italic: false, strike: false, code: false };
   const bold = hasChildElement(rPr, "b") && !isFalseToggle(getFirstChildElement(rPr, "b"));
@@ -940,12 +1187,7 @@ async function convertHyperlink(el, ctx) {
     const anchor = el.getAttributeNS(NS_WML, "anchor") ?? el.getAttribute("w:anchor");
     if (anchor) url = `#${anchor}`;
   }
-  const inlines = [];
-  for (const child of Array.from(el.children)) {
-    if (child.localName === "r") {
-      inlines.push(...await convertRun(child, ctx));
-    }
-  }
+  const inlines = await convertInlineElements(Array.from(el.children), ctx);
   if (inlines.length === 0) return null;
   return {
     type: "link",
@@ -955,22 +1197,14 @@ async function convertHyperlink(el, ctx) {
 }
 async function extractImage(el, ctx) {
   const blip = findDescendant(el, "blip");
-  if (!blip) {
-    return { type: "image", url: "", alt: "Image" };
-  }
-  const rId = blip.getAttributeNS(NS_R, "embed") ?? blip.getAttribute("r:embed");
-  if (!rId) {
-    return { type: "image", url: "", alt: "Image" };
-  }
+  const imageData = findDescendant(el, "imagedata");
+  const rId = blip ? blip.getAttributeNS(NS_R, "embed") ?? blip.getAttribute("r:embed") : imageData?.getAttributeNS(NS_R, "id") ?? imageData?.getAttribute("r:id") ?? imageData?.getAttribute("o:relid");
+  if (!rId) return null;
   const rel = ctx.documentRels.get(rId);
-  if (!rel) {
-    return { type: "image", url: "", alt: "Image" };
-  }
-  const target = rel.target.startsWith("/") ? rel.target.slice(1) : `word/${rel.target}`;
+  if (!rel || rel.targetMode === "External") return null;
+  const target = resolveTarget(baseDirOf(ctx.currentPartPath), rel.target);
   const data = await getPartBinary(ctx.pkg, target);
-  if (!data) {
-    return { type: "image", url: "", alt: "Image" };
-  }
+  if (!data) return null;
   const dot = target.lastIndexOf(".");
   const ext = dot !== -1 ? target.slice(dot).toLowerCase() : ".png";
   const mimeType = extToMime(ext);
@@ -978,7 +1212,8 @@ async function extractImage(el, ctx) {
   const imagePath = `images/image${ctx.imageCounter}${ext}`;
   ctx.extractedImages.set(imagePath, { data, mimeType });
   const docPr = findDescendant(el, "docPr");
-  const alt = docPr?.getAttribute("descr") || docPr?.getAttribute("title") || "Image";
+  const shape = findDescendant(el, "shape");
+  const alt = docPr?.getAttribute("descr") || docPr?.getAttribute("title") || shape?.getAttribute("alt") || shape?.getAttribute("title") || "Image";
   return {
     type: "image",
     url: imagePath,
@@ -993,6 +1228,14 @@ function findDescendant(el, localName) {
   }
   return null;
 }
+function findDescendants(el, localName) {
+  const results = [];
+  for (const child of Array.from(el.children)) {
+    if (child.localName === localName) results.push(child);
+    results.push(...findDescendants(child, localName));
+  }
+  return results;
+}
 async function collectList(elements, startIdx, ctx) {
   const firstNumPr = getNumPr(elements[startIdx]);
   const { numId } = firstNumPr;
@@ -1020,6 +1263,8 @@ async function collectList(elements, startIdx, ctx) {
             children: nested.items
           };
           lastItem.children.push(nestedList);
+        } else {
+          items.push(...nested.items);
         }
         i += nested.consumed;
         consumed += nested.consumed;
@@ -1100,42 +1345,40 @@ async function convertTableRow2(trEl, ctx, isHeader) {
   return { type: "tableRow", children: cells };
 }
 async function convertTableCell2(tcEl, ctx, isHeader) {
-  const inlines = [];
-  const paragraphs = getAllChildElements(tcEl, "p");
-  for (let pi = 0; pi < paragraphs.length; pi++) {
-    if (pi > 0) {
-      inlines.push({ type: "break" });
-    }
-    const runs = await convertRuns(paragraphs[pi], ctx);
-    inlines.push(...runs);
-  }
+  const inlines = await flattenContainerToInlines(tcEl, ctx);
   return {
     type: "tableCell",
     isHeader,
     children: mergeAdjacentText(inlines)
   };
 }
-async function convertFootnoteDefinitions(ctx) {
+async function convertNoteDefinitions(ctx) {
+  return [
+    ...await convertNotePartDefinitions(ctx, ctx.footnotes, "fn", "word/footnotes.xml"),
+    ...await convertNotePartDefinitions(ctx, ctx.endnotes, "endnote", "word/endnotes.xml")
+  ];
+}
+async function convertNotePartDefinitions(ctx, notes, identifierPrefix, partPath) {
   const results = [];
-  for (const [id, el] of ctx.footnotes) {
-    const children = [];
-    const paragraphs = getAllChildElements(el, "p");
-    for (const p of paragraphs) {
-      const inlines = await convertRuns(p, ctx);
-      if (inlines.length > 0) {
-        children.push({
-          type: "paragraph",
-          children: inlines
+  const previousRelationships = ctx.documentRels;
+  const previousPartPath = ctx.currentPartPath;
+  const partRelationships = await getPartRelationships(ctx.pkg, partPath);
+  ctx.documentRels = new Map(partRelationships.map((rel) => [rel.id, rel]));
+  ctx.currentPartPath = partPath;
+  try {
+    for (const [id, el] of notes) {
+      const children = await convertBody(el, ctx);
+      if (children.length > 0) {
+        results.push({
+          type: "footnoteDefinition",
+          identifier: `${identifierPrefix}${id}`,
+          children
         });
       }
     }
-    if (children.length > 0) {
-      results.push({
-        type: "footnoteDefinition",
-        identifier: `fn${id}`,
-        children
-      });
-    }
+  } finally {
+    ctx.documentRels = previousRelationships;
+    ctx.currentPartPath = previousPartPath;
   }
   return results;
 }
@@ -1209,4 +1452,3 @@ export {
   docxToDoc,
   docxToContainer
 };
-//# sourceMappingURL=chunk-CRAVSMPZ.js.map