npm - @bendyline/squisq-formats - Versions diffs - 2.0.1 → 2.2.0 - Mend

@bendyline/squisq-formats 2.0.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (195) hide show

package/LICENSE +21 -0
package/NOTICE.md +20 -0
package/README.md +1 -1
package/dist/{chunk-CRAVSMPZ.js → chunk-26ISNJ7Y.js} +356 -114
package/dist/{chunk-NKAJPJ4G.js → chunk-2JJ5RFDZ.js} +0 -1
package/dist/{chunk-HTW2M27H.js → chunk-3NKXBZSR.js} +193 -42
package/dist/{chunk-U32AG3G3.js → chunk-4V3KCHAP.js} +3 -4
package/dist/{chunk-MLX2BOJC.js → chunk-6RQOV3B3.js} +1 -2
package/dist/{chunk-QRVN6A6E.js → chunk-6S6GU3ZG.js} +5 -6
package/dist/{chunk-FE6OJV6O.js → chunk-7AWFHP5U.js} +1 -1
package/dist/{chunk-RFAPOKHJ.js → chunk-AD2WT564.js} +59 -9
package/dist/{chunk-O3GVVND4.js → chunk-AONELFLA.js} +0 -1
package/dist/{chunk-XKUMNGBW.js → chunk-EJTNGKEA.js} +5 -8
package/dist/chunk-GX7RAUME.js +121 -0
package/dist/{chunk-SSUPBUF5.js → chunk-IIQYS2YH.js} +0 -1
package/dist/{chunk-ABVI556T.js → chunk-IPN56VLW.js} +83 -58
package/dist/{chunk-LXYLOOST.js → chunk-JE6LSIHE.js} +83 -22
package/dist/{chunk-U4MRIFKL.js → chunk-JU2RHXUB.js} +0 -1
package/dist/{chunk-4VUWTSGM.js → chunk-K6XRMVPW.js} +64 -31
package/dist/{chunk-ODL3SSPT.js → chunk-KXOZMWBS.js} +0 -1
package/dist/chunk-OGS5VCGJ.js +446 -0
package/dist/{chunk-GVS2XXV6.js → chunk-PJXJI2LY.js} +449 -57
package/dist/{chunk-2KPARF2P.js → chunk-PU7REGWV.js} +5 -8
package/dist/{chunk-PN52A5AA.js → chunk-SBUW7NHR.js} +0 -1
package/dist/{chunk-VSYHZECT.js → chunk-TAAENIRB.js} +5 -8
package/dist/{chunk-WC7WULGV.js → chunk-X2DEAXNK.js} +62 -2
package/dist/container/index.js +1 -2
package/dist/csv/index.d.ts +27 -2
package/dist/csv/index.js +1 -2
package/dist/docx/index.d.ts +5 -1
package/dist/docx/index.js +9 -10
package/dist/epub/index.d.ts +2 -0
package/dist/epub/index.js +5 -6
package/dist/{export-D2NkylDT.d.ts → export-D9msROJS.d.ts} +18 -6
package/dist/extract-MN7LA3NL.js +13 -0
package/dist/html/index.d.ts +11 -4
package/dist/html/index.js +3 -4
package/dist/images-ESPQKVTW.js +6 -0
package/dist/{import-K8mfc0fz.d.ts → import-C3htUTss.d.ts} +5 -1
package/dist/{import-DTkDxHmZ.d.ts → import-C8whCC7_.d.ts} +6 -0
package/dist/index.d.ts +7 -7
package/dist/index.js +28 -26
package/dist/infer/index.d.ts +3 -3
package/dist/infer/index.js +7 -9
package/dist/{layouts-BHrgZ5FS.d.ts → layouts-CTdPlB-u.d.ts} +1 -1
package/dist/layouts-DRWZGSPD.js +10 -0
package/dist/{mapTheme-IR27S6IV.js → mapTheme-4TWH25FT.js} +1 -2
package/dist/ooxml/index.d.ts +3 -3
package/dist/ooxml/index.js +14 -13
package/dist/pdf/index.d.ts +18 -0
package/dist/pdf/index.js +2 -3
package/dist/pptx/index.d.ts +4 -4
package/dist/pptx/index.js +11 -13
package/dist/{reader-B9L8Ucbj.d.ts → reader-B_m1aKZC.d.ts} +30 -1
package/dist/registry/index.d.ts +21 -5
package/dist/registry/index.js +9 -6
package/dist/{themeReader-DJKErl_j.d.ts → themeReader-DCtwC83Q.d.ts} +1 -1
package/dist/xlsx/index.d.ts +3 -3
package/dist/xlsx/index.js +6 -7
package/package.json +6 -3
package/dist/chunk-2KPARF2P.js.map +0 -1
package/dist/chunk-4VUWTSGM.js.map +0 -1
package/dist/chunk-6M7Z25LA.js +0 -46
package/dist/chunk-6M7Z25LA.js.map +0 -1
package/dist/chunk-ABVI556T.js.map +0 -1
package/dist/chunk-CRAVSMPZ.js.map +0 -1
package/dist/chunk-FE6OJV6O.js.map +0 -1
package/dist/chunk-GVS2XXV6.js.map +0 -1
package/dist/chunk-HTW2M27H.js.map +0 -1
package/dist/chunk-LXYLOOST.js.map +0 -1
package/dist/chunk-MLX2BOJC.js.map +0 -1
package/dist/chunk-NKAJPJ4G.js.map +0 -1
package/dist/chunk-O3GVVND4.js.map +0 -1
package/dist/chunk-ODL3SSPT.js.map +0 -1
package/dist/chunk-PN52A5AA.js.map +0 -1
package/dist/chunk-QRVN6A6E.js.map +0 -1
package/dist/chunk-RFAPOKHJ.js.map +0 -1
package/dist/chunk-SSUPBUF5.js.map +0 -1
package/dist/chunk-U32AG3G3.js.map +0 -1
package/dist/chunk-U4MRIFKL.js.map +0 -1
package/dist/chunk-VJJM2SSH.js +0 -275
package/dist/chunk-VJJM2SSH.js.map +0 -1
package/dist/chunk-VSYHZECT.js.map +0 -1
package/dist/chunk-WC7WULGV.js.map +0 -1
package/dist/chunk-XKUMNGBW.js.map +0 -1
package/dist/chunk-YRT7GQ5Y.js +0 -28
package/dist/chunk-YRT7GQ5Y.js.map +0 -1
package/dist/container/index.js.map +0 -1
package/dist/csv/index.js.map +0 -1
package/dist/docx/index.js.map +0 -1
package/dist/epub/index.js.map +0 -1
package/dist/extract-H6RXJMHP.js +0 -15
package/dist/extract-H6RXJMHP.js.map +0 -1
package/dist/html/index.js.map +0 -1
package/dist/images-7FBWPKE3.js +0 -7
package/dist/images-7FBWPKE3.js.map +0 -1
package/dist/index.js.map +0 -1
package/dist/infer/index.js.map +0 -1
package/dist/layouts-QVPK3ZCU.js +0 -12
package/dist/layouts-QVPK3ZCU.js.map +0 -1
package/dist/mapTheme-IR27S6IV.js.map +0 -1
package/dist/ooxml/index.js.map +0 -1
package/dist/pdf/index.js.map +0 -1
package/dist/pptx/index.js.map +0 -1
package/dist/registry/index.js.map +0 -1
package/dist/xlsx/index.js.map +0 -1
package/src/__tests__/container.test.ts +0 -230
package/src/__tests__/convert.test.ts +0 -495
package/src/__tests__/csvImport.test.ts +0 -84
package/src/__tests__/docxExport.test.ts +0 -457
package/src/__tests__/docxImport.test.ts +0 -410
package/src/__tests__/epub.test.ts +0 -649
package/src/__tests__/exportThemeReconciliation.test.ts +0 -87
package/src/__tests__/formatRegistry.test.ts +0 -174
package/src/__tests__/html.test.ts +0 -435
package/src/__tests__/htmlImport.test.ts +0 -57
package/src/__tests__/inferTheme.test.ts +0 -135
package/src/__tests__/lossyWarnings.test.ts +0 -146
package/src/__tests__/ooxml.test.ts +0 -271
package/src/__tests__/ooxmlCancellation.test.ts +0 -113
package/src/__tests__/ooxmlThemeReader.test.ts +0 -92
package/src/__tests__/pdfExport.test.ts +0 -322
package/src/__tests__/pdfImport.test.ts +0 -384
package/src/__tests__/plainHtml.test.ts +0 -417
package/src/__tests__/plainHtmlBundle.test.ts +0 -253
package/src/__tests__/pptxExport.test.ts +0 -138
package/src/__tests__/pptxImport.test.ts +0 -145
package/src/__tests__/pptxInferFixtures.ts +0 -314
package/src/__tests__/pptxLayoutInfer.test.ts +0 -395
package/src/__tests__/roundTrip.test.ts +0 -201
package/src/__tests__/roundTripAssets.test.ts +0 -50
package/src/__tests__/roundTripMatrix.fixtures.ts +0 -86
package/src/__tests__/roundTripMatrix.helpers.ts +0 -154
package/src/__tests__/roundTripMatrix.test.ts +0 -142
package/src/__tests__/sharedContainer.test.ts +0 -41
package/src/__tests__/sharedImages.test.ts +0 -61
package/src/__tests__/xlsxExport.test.ts +0 -164
package/src/__tests__/xlsxImport.test.ts +0 -80
package/src/__tests__/zipSafety.test.ts +0 -317
package/src/container/index.ts +0 -94
package/src/csv/index.ts +0 -188
package/src/docx/export.ts +0 -1267
package/src/docx/import.ts +0 -995
package/src/docx/index.ts +0 -26
package/src/docx/styles.ts +0 -145
package/src/epub/export.ts +0 -968
package/src/epub/index.ts +0 -20
package/src/html/docsHtmlBundle.ts +0 -373
package/src/html/htmlTemplate.ts +0 -385
package/src/html/imageUtils.ts +0 -61
package/src/html/import.ts +0 -297
package/src/html/index.ts +0 -212
package/src/html/plainHtml.ts +0 -790
package/src/html/plainHtmlBundle.ts +0 -421
package/src/index.ts +0 -109
package/src/infer/extract.ts +0 -127
package/src/infer/index.ts +0 -199
package/src/infer/mapTheme.ts +0 -176
package/src/infer/types.ts +0 -27
package/src/ooxml/index.ts +0 -111
package/src/ooxml/namespaces.ts +0 -196
package/src/ooxml/readUtils.ts +0 -44
package/src/ooxml/reader.ts +0 -318
package/src/ooxml/themeReader.ts +0 -197
package/src/ooxml/types.ts +0 -103
package/src/ooxml/writer.ts +0 -339
package/src/ooxml/xmlUtils.ts +0 -123
package/src/pdf/export.ts +0 -1084
package/src/pdf/import.ts +0 -1164
package/src/pdf/index.ts +0 -29
package/src/pdf/styles.ts +0 -180
package/src/pptx/export.ts +0 -1184
package/src/pptx/import.ts +0 -455
package/src/pptx/index.ts +0 -52
package/src/pptx/layouts.ts +0 -1222
package/src/pptx/styles.ts +0 -96
package/src/pptx/templates.ts +0 -187
package/src/registry/convert.ts +0 -433
package/src/registry/defaultFormats.ts +0 -413
package/src/registry/errors.ts +0 -46
package/src/registry/index.ts +0 -43
package/src/registry/registry.ts +0 -48
package/src/registry/types.ts +0 -170
package/src/shared/boundedZipArchive.ts +0 -383
package/src/shared/container.ts +0 -28
package/src/shared/fidelity.ts +0 -130
package/src/shared/images.ts +0 -44
package/src/shared/inlineRuns.ts +0 -99
package/src/shared/text.ts +0 -41
package/src/shared/zipEntryCount.ts +0 -151
package/src/shared/zipLimits.ts +0 -296
package/src/shared/zipSafety.ts +0 -19
package/src/xlsx/export.ts +0 -253
package/src/xlsx/import.ts +0 -160
package/src/xlsx/index.ts +0 -35

package/dist/{chunk-LXYLOOST.js → chunk-JE6LSIHE.js} RENAMED Viewed

@@ -2,7 +2,7 @@ import {
   arrayBufferToBase64DataUrl,
   extractFilename,
   inferMimeType
-} from "./chunk-MLX2BOJC.js";
+} from "./chunk-6RQOV3B3.js";
 // src/html/index.ts
 import JSZip3 from "jszip";
@@ -119,7 +119,23 @@ function scanTemplateImageFields(obj, paths) {
   }
 }
 function escapeForScript(str) {
-  return str.replace(/<\/(script)/gi, "<\\/$1");
+  return str.replace(/<(?=!--|\/?script)/gi, "\\u003c");
+}
+function buildInlineImageMaps(images) {
+  const imageMap = {};
+  const imageAliases = {};
+  if (!images) return { imageMap, imageAliases };
+  const canonicalKeyFor = /* @__PURE__ */ new Map();
+  for (const [path, buffer] of images.entries()) {
+    const canonical = canonicalKeyFor.get(buffer);
+    if (canonical !== void 0) {
+      imageAliases[path] = canonical;
+      continue;
+    }
+    canonicalKeyFor.set(buffer, path);
+    imageMap[path] = arrayBufferToBase64DataUrl(buffer, inferMimeType(path));
+  }
+  return { imageMap, imageAliases };
 }
 function generateInlineHtml(doc, options) {
   const {
@@ -132,15 +148,10 @@ function generateInlineHtml(doc, options) {
     themeRegistry
   } = options;
   doc = applyThemeSelection(doc, themeId, themeRegistry);
-  const imageMap = {};
-  if (images) {
-    for (const [path, buffer] of images.entries()) {
-      const mimeType = inferMimeType(path);
-      imageMap[path] = arrayBufferToBase64DataUrl(buffer, mimeType);
-    }
-  }
+  const { imageMap, imageAliases } = buildInlineImageMaps(images);
   const docJson = escapeForScript(JSON.stringify(doc));
   const imageMapJson = escapeForScript(JSON.stringify(imageMap));
+  const imageAliasJson = escapeForScript(JSON.stringify(imageAliases));
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -151,7 +162,7 @@ function generateInlineHtml(doc, options) {
 *,*::before,*::after{box-sizing:border-box}
 html,body{margin:0;padding:0;height:100%;background:#1a1a2e;color:#e0e0e0;font-family:system-ui,-apple-system,sans-serif}
 #squisq-root{width:100%;height:100%;display:flex;align-items:center;justify-content:center}
-${mode === "static" ? "#squisq-root{align-items:flex-start;overflow-y:auto;background:#fff;color:#1f2937}" : ""}
+${mode === "static" ? "#squisq-root{display:block}" : ""}
 </style>
 </head>
 <body>
@@ -161,6 +172,14 @@ ${mode === "static" ? "#squisq-root{align-items:flex-start;overflow-y:auto;backg
 (function(){
   var doc = JSON.parse(${JSON.stringify(docJson)});
   var images = JSON.parse(${JSON.stringify(imageMapJson)});
+  // Re-expand path/basename aliases that share a payload (see
+  // buildInlineImageMaps) so \`images\` has every key the resolver may ask for.
+  var aliases = JSON.parse(${JSON.stringify(imageAliasJson)});
+  for (var alias in aliases) {
+    if (Object.prototype.hasOwnProperty.call(aliases, alias)) {
+      images[alias] = images[aliases[alias]];
+    }
+  }
   SquisqPlayer.mount(document.getElementById("squisq-root"), doc, {
     mode: ${JSON.stringify(mode)},
     images: images,
@@ -197,7 +216,7 @@ function generateExternalHtml(doc, options) {
 *,*::before,*::after{box-sizing:border-box}
 html,body{margin:0;padding:0;height:100%;background:#1a1a2e;color:#e0e0e0;font-family:system-ui,-apple-system,sans-serif}
 #squisq-root{width:100%;height:100%;display:flex;align-items:center;justify-content:center}
-${mode === "static" ? "#squisq-root{align-items:flex-start;overflow-y:auto;background:#fff;color:#1f2937}" : ""}
+${mode === "static" ? "#squisq-root{display:block}" : ""}
 </style>
 </head>
 <body>
@@ -248,21 +267,31 @@ import {
 import { resolveFontFamily, buildGoogleFontsUrl } from "@bendyline/squisq/schemas";
 import { resolveThemeForDoc } from "@bendyline/squisq/doc";
 function markdownDocToPlainHtml(doc, options = {}) {
-  const { title = "Document", images, links, themeId, iconsCss, htmlPolicy = "sanitize" } = options;
+  const {
+    title = "Document",
+    images,
+    links,
+    themeId,
+    iconsCss,
+    htmlPolicy = "sanitize",
+    externalResources = "deny"
+  } = options;
   const resolveId = themeId ?? readFrontmatterThemeId2(doc.frontmatter);
   const theme = options.theme ?? (resolveId ? resolveThemeForDoc(doc, resolveId, options.themeRegistry) : void 0);
   const ctx = { images, links, htmlPolicy };
   const body = renderTopLevel(doc.children, ctx);
-  const fontsLink = theme ? renderFontsLink(theme) : "";
+  const fontsLink = theme && externalResources === "allow" ? renderFontsLink(theme) : "";
   const usesIcons = docUsesIcons(doc);
   let iconsLink = "";
   if (usesIcons) {
     iconsLink = iconsCss ? `<style data-fa-inline>
-${iconsCss}
+${escapeStyleText(iconsCss)}
 </style>
-` : FONT_AWESOME_LINK;
+` : externalResources === "allow" ? FONT_AWESOME_LINK : "";
   }
   const themedCss = theme ? renderThemedCss(theme) : DEFAULT_CSS;
+  const safeCss = escapeStyleText(`${themedCss}
+${FEATURE_CSS}`);
   return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -270,8 +299,7 @@ ${iconsCss}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>${escapeHtml2(title)}</title>
 ${fontsLink}${iconsLink}<style>
-${themedCss}
-${FEATURE_CSS}
+${safeCss}
 </style>
 </head>
 <body>
@@ -279,7 +307,10 @@ ${body}
 </body>
 </html>`;
 }
-var FONT_AWESOME_LINK = `<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer">
+function escapeStyleText(css) {
+  return css.replace(/</g, "\\3c ");
+}
+var FONT_AWESOME_LINK = `<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.2.0/css/all.min.css" crossorigin="anonymous" referrerpolicy="no-referrer">
 `;
 function docUsesIcons(doc) {
   function visit(node) {
@@ -1379,6 +1410,14 @@ function toHtmlString(data) {
   return new TextDecoder("utf-8").decode(bytes);
 }
 function htmlToMarkdownDocSync(html, options = {}) {
+  options.signal?.throwIfAborted();
+  const maxInputChars = options.maxInputChars ?? 16 * 1024 * 1024;
+  if (!Number.isSafeInteger(maxInputChars) || maxInputChars < 0) {
+    throw new RangeError("maxInputChars must be a non-negative safe integer");
+  }
+  if (html.length > maxInputChars) {
+    throw new RangeError(`HTML exceeds the ${maxInputChars}-character safety limit`);
+  }
   let nodes = parseHtmlToNodes(html);
   if (options.sanitize !== false) nodes = sanitizeHtmlNodes2(nodes);
   return { type: "document", children: blocksFromNodes(nodes) };
@@ -1387,7 +1426,7 @@ async function htmlToMarkdownDoc(data, options = {}) {
   return htmlToMarkdownDocSync(toHtmlString(data), options);
 }
 function htmlToMarkdown(html, options = {}) {
-  return stringifyMarkdown(htmlToMarkdownDocSync(html, options));
+  return stringifyMarkdown(htmlToMarkdownDocSync(html, options), { signal: options.signal });
 }
 // src/html/index.ts
@@ -1397,10 +1436,21 @@ function sanitizeZipPath3(path) {
   if (normalized.split("/").some((seg) => seg === "..")) return null;
   return normalized;
 }
+function uniqueFilename(filename, used) {
+  if (!used.has(filename)) return filename;
+  const dot = filename.lastIndexOf(".");
+  const base = dot > 0 ? filename.slice(0, dot) : filename;
+  const ext = dot > 0 ? filename.slice(dot) : "";
+  let suffix = 2;
+  while (used.has(`${base}-${suffix}${ext}`)) suffix++;
+  return `${base}-${suffix}${ext}`;
+}
 function docToHtml(doc, options) {
+  options.signal?.throwIfAborted();
   return generateInlineHtml(doc, options);
 }
 async function docToHtmlZip(doc, options) {
+  options.signal?.throwIfAborted();
   const {
     playerScript,
     images,
@@ -1415,18 +1465,30 @@ async function docToHtmlZip(doc, options) {
   zip.file("squisq-player.js", playerScript);
   const imagePathMap = {};
   if (images) {
+    let imageIndex = 0;
     for (const [originalPath, buffer] of images.entries()) {
+      if ((imageIndex++ & 63) === 0) options.signal?.throwIfAborted();
       const zipPath = sanitizeZipPath3(originalPath);
-      if (!zipPath) continue;
+      if (!zipPath) {
+        console.warn(
+          `[squisq] docToHtmlZip: skipped image with unsafe path "${originalPath}" \u2014 the exported document will have a broken reference to it.`
+        );
+        continue;
+      }
       zip.file(zipPath, buffer);
       imagePathMap[originalPath] = zipPath;
     }
   }
   const audioPathMap = {};
   if (audio) {
+    let audioIndex = 0;
+    const usedAudioNames = /* @__PURE__ */ new Set();
     for (const [segmentKey, buffer] of audio.entries()) {
+      if ((audioIndex++ & 63) === 0) options.signal?.throwIfAborted();
       const filename = extractFilename(segmentKey);
-      const finalName = filename.includes(".") ? filename : `${filename}.mp3`;
+      const named = filename.includes(".") ? filename : `${filename}.mp3`;
+      const finalName = uniqueFilename(named, usedAudioNames);
+      usedAudioNames.add(finalName);
       const zipPath = `audio/${finalName}`;
       zip.file(zipPath, buffer);
       audioPathMap[segmentKey] = zipPath;
@@ -1462,4 +1524,3 @@ export {
   docToHtml,
   docToHtmlZip
 };
-//# sourceMappingURL=chunk-LXYLOOST.js.map

package/dist/{chunk-U4MRIFKL.js → chunk-JU2RHXUB.js} RENAMED Viewed

@@ -40,4 +40,3 @@ export {
   xmlElement,
   textElement
 };
-//# sourceMappingURL=chunk-U4MRIFKL.js.map

package/dist/{chunk-4VUWTSGM.js → chunk-K6XRMVPW.js} RENAMED Viewed

@@ -1,13 +1,13 @@
 import {
   extractPlainText
-} from "./chunk-PN52A5AA.js";
+} from "./chunk-SBUW7NHR.js";
 import {
   escapeXml
-} from "./chunk-U4MRIFKL.js";
+} from "./chunk-JU2RHXUB.js";
 import {
   extractFilename,
   inferMimeType
-} from "./chunk-MLX2BOJC.js";
+} from "./chunk-6RQOV3B3.js";
 // src/epub/export.ts
 import JSZip from "jszip";
@@ -15,6 +15,7 @@ import { resolveFontFamily } from "@bendyline/squisq/schemas";
 import { resolveThemeForDoc } from "@bendyline/squisq/doc";
 import { readFrontmatterThemeId, sanitizeUrl } from "@bendyline/squisq/markdown";
 async function markdownDocToEpub(doc, options = {}) {
+  options.signal?.throwIfAborted();
   const fmTitle = doc.frontmatter?.title;
   const fmAuthor = doc.frontmatter?.author;
   const title = options.title ?? (typeof fmTitle === "string" ? fmTitle : "Untitled");
@@ -28,7 +29,9 @@ async function markdownDocToEpub(doc, options = {}) {
   const resolvedImages = /* @__PURE__ */ new Map();
   const usedImageNames = /* @__PURE__ */ new Set();
   if (options.images) {
+    let imageIndex = 0;
     for (const src of imageEntries) {
+      if ((imageIndex++ & 63) === 0) options.signal?.throwIfAborted();
       const data = options.images.get(src);
       if (data) {
         const filename = uniqueFilename(safeArchiveBasename(src, "image"), usedImageNames);
@@ -47,6 +50,7 @@ async function markdownDocToEpub(doc, options = {}) {
   zip.file("META-INF/container.xml", CONTAINER_XML);
   zip.file("OEBPS/styles.css", css);
   for (const [, img] of resolvedImages) {
+    options.signal?.throwIfAborted();
     zip.file(`OEBPS/images/${img.filename}`, img.data);
   }
   let coverFilename;
@@ -134,12 +138,17 @@ async function markdownDocToEpub(doc, options = {}) {
     const id = `chapter-${num}`;
     const filename = `${id}.xhtml`;
     const audioInfo = chapterAudio[i] ?? null;
-    const xhtml = renderChapterXhtml(chap.nodes, title, resolvedImages, audioInfo !== null);
+    const { xhtml, ids } = renderChapterXhtml(
+      chap.nodes,
+      title,
+      resolvedImages,
+      audioInfo !== null
+    );
     zip.file(`OEBPS/chapters/${filename}`, xhtml);
     let smilFilename;
     if (audioInfo) {
       smilFilename = `${id}.smil`;
-      const smil = generateSmil(filename, audioInfo, chap.nodes);
+      const smil = generateSmil(filename, audioInfo, ids);
       zip.file(`OEBPS/chapters/${smilFilename}`, smil);
     }
     chapterFiles.push({
@@ -248,10 +257,14 @@ function collectDocImages(nodes) {
   return images;
 }
 function renderChapterXhtml(nodes, bookTitle, images, addIds = false) {
-  let elementCounter = 0;
-  const nextId = () => `p${++elementCounter}`;
+  const ids = [];
+  const nextId = () => {
+    const id = `p${ids.length + 1}`;
+    ids.push(id);
+    return id;
+  };
   const body = nodes.map((n) => blockToXhtml(n, images, addIds ? nextId : void 0)).join("\n");
-  return `<?xml version="1.0" encoding="UTF-8"?>
+  const xhtml = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
 <head>
@@ -263,40 +276,46 @@ function renderChapterXhtml(nodes, bookTitle, images, addIds = false) {
 ${body}
 </body>
 </html>`;
+  return { xhtml, ids };
 }
 function blockToXhtml(node, images, nextId) {
-  const idAttr = nextId ? ` id="${nextId()}"` : "";
+  let cached;
+  const idAttr = () => {
+    if (!nextId) return "";
+    cached ?? (cached = ` id="${nextId()}"`);
+    return cached;
+  };
   switch (node.type) {
     case "heading": {
       const tag = `h${node.depth}`;
-      return `<${tag}${idAttr}>${inlinesToXhtml(node.children, images)}</${tag}>`;
+      return `<${tag}${idAttr()}>${inlinesToXhtml(node.children, images)}</${tag}>`;
     }
     case "paragraph":
-      return `<p${idAttr}>${inlinesToXhtml(node.children, images)}</p>`;
+      return `<p${idAttr()}>${inlinesToXhtml(node.children, images)}</p>`;
     case "blockquote":
-      return `<blockquote${idAttr}>
+      return `<blockquote${idAttr()}>
 ${node.children.map((c) => blockToXhtml(c, images, nextId)).join("\n")}
 </blockquote>`;
     case "list": {
       const tag = node.ordered ? "ol" : "ul";
       const startAttr = node.ordered && node.start && node.start !== 1 ? ` start="${node.start}"` : "";
       const items = node.children.map((item) => listItemToXhtml(item, images)).join("\n");
-      return `<${tag}${idAttr}${startAttr}>
+      return `<${tag}${idAttr()}${startAttr}>
 ${items}
 </${tag}>`;
     }
     case "code": {
       const langAttr = node.lang ? ` class="language-${escapeXml(node.lang)}"` : "";
-      return `<pre${idAttr}><code${langAttr}>${escapeXml(node.value)}</code></pre>`;
+      return `<pre${idAttr()}><code${langAttr}>${escapeXml(node.value)}</code></pre>`;
     }
     case "thematicBreak":
-      return `<hr${idAttr}/>`;
+      return `<hr${idAttr()}/>`;
     case "table":
-      return tableToXhtml(node, images, idAttr);
+      return tableToXhtml(node, images, idAttr());
     case "htmlBlock":
-      return `<p${idAttr}>${escapeXml(node.rawHtml.replace(/<[^>]+>/g, ""))}</p>`;
+      return `<p${idAttr()}>${escapeXml(node.rawHtml.replace(/<[^>]+>/g, ""))}</p>`;
     case "math":
-      return `<p${idAttr} class="math">${escapeXml(node.value)}</p>`;
+      return `<p${idAttr()} class="math">${escapeXml(node.value)}</p>`;
     default:
       return "";
   }
@@ -386,6 +405,14 @@ function safeArchiveBasename(path, fallback) {
   }).join("").trim();
   return !safe || safe === "." || safe === ".." ? fallback : safe;
 }
+function uniqueManifestId(prefix, filename, used) {
+  const base = `${prefix}-${filename.replace(/[^a-zA-Z0-9]/g, "-")}`;
+  let id = base;
+  let suffix = 2;
+  while (used.has(id)) id = `${base}-${suffix++}`;
+  used.add(id);
+  return id;
+}
 function uniqueFilename(filename, used) {
   if (!used.has(filename)) return filename;
   const dot = filename.lastIndexOf(".");
@@ -395,22 +422,24 @@ function uniqueFilename(filename, used) {
   while (used.has(`${base}-${suffix}${ext}`)) suffix++;
   return `${base}-${suffix}${ext}`;
 }
-function generateSmil(chapterFilename, audioInfo, nodes) {
-  let elementCount = 0;
-  function countBlocks(node) {
-    elementCount++;
-    if (node.type === "blockquote") node.children.forEach(countBlocks);
+function generateSmil(chapterFilename, audioInfo, elementIds) {
+  if (elementIds.length === 0) {
+    return `<?xml version="1.0" encoding="UTF-8"?>
+<smil xmlns="http://www.w3.org/ns/SMIL" xmlns:epub="http://www.idpf.org/2007/ops" version="3.0">
+  <body>
+    <seq id="seq-1" epub:textref="${chapterFilename}">
+    </seq>
+  </body>
+</smil>`;
   }
-  nodes.forEach(countBlocks);
-  if (elementCount === 0) elementCount = 1;
-  const clipDuration = audioInfo.duration / elementCount;
+  const clipDuration = audioInfo.duration / elementIds.length;
   const pars = [];
-  for (let i = 0; i < elementCount; i++) {
+  for (let i = 0; i < elementIds.length; i++) {
     const clipStart = formatTime(audioInfo.clipStart + i * clipDuration, true);
     const clipEnd = formatTime(audioInfo.clipStart + (i + 1) * clipDuration, true);
     pars.push(
       `    <par id="par-${i + 1}">
-      <text src="${chapterFilename}#p${i + 1}"/>
+      <text src="${chapterFilename}#${escapeXml(elementIds[i])}"/>
       <audio src="../audio/${escapeXml(audioInfo.audioFilename)}" clipBegin="${clipStart}" clipEnd="${clipEnd}"/>
     </par>`
     );
@@ -477,12 +506,17 @@ function generateContentOpf(params) {
       );
     }
   }
+  const usedManifestIds = /* @__PURE__ */ new Set(["cover-image", "cover-page"]);
+  for (const chap of chapters) {
+    usedManifestIds.add(chap.id);
+    if (chap.smilFilename) usedManifestIds.add(`${chap.id}-overlay`);
+  }
   if (audioFiles) {
     const usedAudioNames = /* @__PURE__ */ new Set();
     for (const af of audioFiles) {
       if (usedAudioNames.has(af.filename)) continue;
       usedAudioNames.add(af.filename);
-      const audioId = `audio-${af.filename.replace(/[^a-zA-Z0-9]/g, "-")}`;
+      const audioId = uniqueManifestId("audio", af.filename, usedManifestIds);
       manifestItems.push(
         `    <item id="${audioId}" href="audio/${escapeXml(af.filename)}" media-type="${af.mime}"/>`
       );
@@ -492,7 +526,7 @@ function generateContentOpf(params) {
   for (const [, img] of images) {
     if (usedFilenames.has(img.filename)) continue;
     usedFilenames.add(img.filename);
-    const imgId = `img-${img.filename.replace(/[^a-zA-Z0-9]/g, "-")}`;
+    const imgId = uniqueManifestId("img", img.filename, usedManifestIds);
     manifestItems.push(
       `    <item id="${imgId}" href="images/${escapeXml(img.filename)}" media-type="${img.mime}"/>`
     );
@@ -676,4 +710,3 @@ export {
   markdownDocToEpub,
   docToEpub
 };
-//# sourceMappingURL=chunk-4VUWTSGM.js.map

package/dist/{chunk-ODL3SSPT.js → chunk-KXOZMWBS.js} RENAMED Viewed

@@ -15,4 +15,3 @@ var ConversionError = class extends Error {
 export {
   ConversionError
 };
-//# sourceMappingURL=chunk-ODL3SSPT.js.map