@bendyline/squisq-formats 2.1.0 → 2.2.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Bendyline LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/NOTICE.md

@@ -0,0 +1,20 @@
+# Third-Party Notices for @bendyline/squisq-formats
+
+This notice applies to the `@bendyline/squisq-formats` npm package.
+Squisq-authored code is licensed under the MIT license in `LICENSE`.
+Third-party components remain under their respective license terms.
+
+## Runtime dependencies
+
+| Package           | Version | License                 | Repository                          |
+| ----------------- | ------- | ----------------------- | ----------------------------------- |
+| @bendyline/squisq | 2.1.0   | MIT                     | https://github.com/bendyline/squisq |
+| @pdf-lib/upng     | 1.0.1   | MIT                     | https://github.com/Hopding/upng     |
+| @xmldom/xmldom    | 0.9.10  | MIT                     | https://github.com/xmldom/xmldom    |
+| jszip             | 3.10.1  | MIT OR GPL-3.0-or-later | https://github.com/Stuk/jszip       |
+| pdf-lib           | 1.17.1  | MIT                     | https://pdf-lib.js.org              |
+| pdfjs-dist        | 4.10.38 | Apache-2.0              | https://mozilla.github.io/pdf.js    |
+
+Squisq uses jszip under its MIT license option. Copyright and complete license
+texts for these dependencies are included in their respective npm
+distributions and source repositories.

package/README.md

@@ -87,7 +87,7 @@ const imported = await pdfToMarkdownDoc(pdfBuffer);
 const container = await pdfToContainer(pdfBuffer);
 ```
 
-**Fidelity:** export uses pdf-lib's standard 14 fonts (`themeId` affects colors only). PDF has no semantic structure, so import is heuristic and best-effort: headings are detected by font size, and tables / code blocks / blockquotes / links via the `detectTables` / `detectCodeBlocks` / `detectBlockquotes` / `detectLinks` options (all default true). `pdfToMarkdownDoc` is text-only; `pdfToContainer` also extracts embedded images, placed **by page** — each image is inserted after the last content block from its page (image-only pages fall back to the nearest preceding page with content, else the document end). Placement is page-level only. Image extraction needs a browser canvas to encode PNG — **under Node it is skipped** (with a `console.warn`) and no images are emitted.
+**Fidelity:** export uses pdf-lib's standard 14 fonts (`themeId` affects colors only). PDF has no semantic structure, so import is heuristic and best-effort: headings are detected by font size, and tables / code blocks / blockquotes / links via the `detectTables` / `detectCodeBlocks` / `detectBlockquotes` / `detectLinks` options (all default true). `pdfToMarkdownDoc` is text-only; `pdfToContainer` also extracts embedded XObject and inline raster images in browsers and Node, placed **by page** — each image is inserted after the last content block from its page (image-only pages fall back to the nearest preceding page with content, else the document end). Placement is page-level only; masks, vector artwork, and images that PDF.js cannot expose as decoded pixels are not emitted.
 
 ### HTML
 

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

@@ -1,21 +1,20 @@
 import {
+  RelIdAllocator,
   inlineNodeToRuns,
-  inlineNodesToRuns
-} from "./chunk-6M7Z25LA.js";
+  inlineNodesToRuns,
+  normalizeOoxmlHex,
+  sanitizeOfficeHyperlink
+} from "./chunk-GX7RAUME.js";
 import {
   stripHtmlTags
-} from "./chunk-PN52A5AA.js";
-import {
-  baseDirOf,
-  resolveTarget
-} from "./chunk-YRT7GQ5Y.js";
+} from "./chunk-SBUW7NHR.js";
 import {
   createPackage
-} from "./chunk-KURGXM4I.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,
@@ -38,17 +37,20 @@ import {
   REL_OFFICE_DOCUMENT,
   REL_SETTINGS,
   REL_STYLES,
+  baseDirOf,
   getPartBinary,
   getPartRelationships,
   getPartXml,
-  openPackage
-} from "./chunk-7ARKUCQT.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";
@@ -111,6 +113,7 @@ 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 stories = partitionDocumentStories(doc.children);
@@ -142,7 +145,14 @@ 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
@@ -172,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;
@@ -186,21 +195,31 @@ 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,
+      target,
       targetMode: "External",
       source: this.relationshipSource
     });
@@ -238,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([
@@ -264,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("");
@@ -426,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>`;
 }
@@ -457,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) {
@@ -536,22 +558,16 @@ function convertFootnoteRef(node, ctx) {
 }
 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 headerRelId = `rId${relCounter++}`;
-  const footerRelId = `rId${relCounter++}`;
   const hasHeader = headerXml.trim().length > 0;
   const hasFooter = footerXml.trim().length > 0;
-  const documentXml = buildDocumentXml(
-    bodyXml,
-    ctx.backgroundColor,
-    hasHeader ? headerRelId : void 0,
-    hasFooter ? footerRelId : void 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);
@@ -593,28 +609,28 @@ async function buildDocxPackage(bodyXml, headerXml, footerXml, 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"
     });
   }
-  if (hasHeader) {
+  if (headerRelId) {
     pkg.addRelationship("word/document.xml", {
       id: headerRelId,
       type: REL_HEADER,
       target: "header1.xml"
     });
   }
-  if (hasFooter) {
+  if (footerRelId) {
     pkg.addRelationship("word/document.xml", {
       id: footerRelId,
       type: REL_FOOTER,
@@ -622,8 +638,7 @@ async function buildDocxPackage(bodyXml, headerXml, footerXml, ctx, options) {
     });
   }
   for (const rel of ctx.relationships) {
-    const sourcePart = rel.source === "header" ? "word/header1.xml" : rel.source === "footer" ? "word/footer1.xml" : "word/document.xml";
-    pkg.addRelationship(sourcePart, {
+    pkg.addRelationship(docxStoryPartPath(rel.source), {
       id: rel.id,
       type: rel.type,
       target: rel.target,
@@ -726,12 +741,14 @@ 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) {
@@ -746,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 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(),
@@ -765,7 +785,8 @@ async function buildImportContext(pkg, options) {
     numbering: /* @__PURE__ */ new Map(),
     footnotes: /* @__PURE__ */ new Map(),
     endnotes: /* @__PURE__ */ new Map(),
-    currentPartPath: "word/document.xml",
+    currentPartPath: mainPartPath,
+    mainPartPath,
     pkg,
     options,
     extractedImages: /* @__PURE__ */ new Map(),
@@ -784,7 +805,7 @@ 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);
   }
@@ -902,7 +923,7 @@ async function convertRelatedStories(body, ctx, kind) {
   const results = [];
   for (const relationship of documentRelationships.values()) {
     if (!relationship.type.endsWith(relationshipTypeSuffix)) continue;
-    const partPath = resolveTarget(baseDirOf("word/document.xml"), relationship.target);
+    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);
@@ -1431,4 +1452,3 @@ export {
   docxToDoc,
   docxToContainer
 };
-//# sourceMappingURL=chunk-NNHKUXKA.js.map

package/dist/{chunk-NKAJPJ4G.js → chunk-2JJ5RFDZ.js}

@@ -103,4 +103,3 @@ export {
   compileExtractedTheme,
   colorHintsFromExtraction
 };
-//# sourceMappingURL=chunk-NKAJPJ4G.js.map