@openpresentation/opf 0.10.1 → 0.11.1

package/dist/{chunk-EWJNRHXA.js → chunk-BP6WMSSS.js}

@@ -1,6 +1,6 @@
-import { validatePresentation, validationDefinition, validateCatalogRecord } from './chunk-ZIL7MGZU.js';
-import { schemas, schemaEntries } from './chunk-D3GQIREP.js';
-import { catalogKinds, catalogEntries, catalogSchemaNames } from './chunk-TU7I3KSB.js';
+import { validatePresentation, validationDefinition, validateCatalogRecord } from './chunk-M4GTWRK7.js';
+import { schemas, schemaEntries } from './chunk-LTSDDBNW.js';
+import { catalogKinds, catalogEntries, catalogSchemaNames } from './chunk-7LF37SG3.js';
 import { parseTree, printParseErrorCode, getNodePath } from 'jsonc-parser';
 
 var own = (value, key) => Object.hasOwn(value, key);

package/dist/{chunk-FHGJX5QK.js → chunk-KWIOQ3QR.js}

@@ -1,6 +1,6 @@
-import { assertValidPresentation } from './chunk-ZIL7MGZU.js';
-import { resolveFontFamilies, resolveCanvasDimensions, composeSlide, tableRowBoundaries } from './chunk-PQJRDNA6.js';
-import { catalogs } from './chunk-TU7I3KSB.js';
+import { assertValidPresentation, visitContentPayloads } from './chunk-M4GTWRK7.js';
+import { DEFAULT_FONT_SCHEME, resolveFontSchemeReference, resolveFontFamilies, resolveCanvasDimensions, composeSlide, tableRowBoundaries } from './chunk-6UPHKXI5.js';
+import { catalogs } from './chunk-7LF37SG3.js';
 
 // src/pagination.ts
 var OPFPaginationError = class extends Error {
@@ -16,6 +16,13 @@ var contentFields = /* @__PURE__ */ new Set(["text", "items", "bullets", "image"
 var headingFields = /* @__PURE__ */ new Set(["title", "subtitle", "tag"]);
 var isRecord = (v) => !!v && typeof v === "object" && !Array.isArray(v);
 var clone = (value) => structuredClone(value);
+var slideIds = (slide) => {
+  const ids = typeof slide.id === "string" ? [slide.id] : [];
+  visitContentPayloads(slide, "", (payload) => {
+    if (typeof payload.id === "string") ids.push(payload.id);
+  });
+  return ids;
+};
 var textOf = (value) => typeof value === "string" ? value : Array.isArray(value) ? value.map(textOf).join("") : value?.text ?? "";
 var graphemes = new Intl.Segmenter("und", { granularity: "grapheme" });
 function sliceRichText(value, start, end) {
@@ -105,7 +112,26 @@ function paginateSlide(input, options = {}) {
   const slides = [], pages = [];
   let selected = /* @__PURE__ */ new Map();
   const reservedIds = new Set(options.reservedIds ?? []);
-  if (typeof source.id === "string") reservedIds.add(source.id);
+  for (const id of slideIds(source)) reservedIds.add(id);
+  const emittedIds = /* @__PURE__ */ new Set();
+  const pageId = (base, pageIndex) => {
+    if (!emittedIds.has(base)) {
+      emittedIds.add(base);
+      return base;
+    }
+    let suffix = pageIndex + 1, id = `${base}--${suffix}`;
+    while (reservedIds.has(id)) id = `${base}--${++suffix}`;
+    reservedIds.add(id);
+    emittedIds.add(id);
+    return id;
+  };
+  const assignPageIds = (slide, pageIndex) => {
+    const assign = (node) => {
+      if (typeof node.id === "string") node.id = pageId(node.id, pageIndex);
+    };
+    assign(slide);
+    visitContentPayloads(slide, "", assign);
+  };
   const project = (portions, pageIndex) => {
     const mappings = [];
     const visit = (node, path, out, root = false) => {
@@ -151,12 +177,7 @@ function paginateSlide(input, options = {}) {
     const { slide, mappings } = project(selected, slides.length);
     const issues = geometry(slide, slides.length).diagnostics;
     if (issues.length) throw new OPFPaginationError("A continuation page does not fit at its final page number. No partial result was returned.", issues);
-    if (slides.length && typeof source.id === "string") {
-      let suffix = slides.length + 1, id = `${source.id}--${suffix}`;
-      while (reservedIds.has(id)) id = `${source.id}--${++suffix}`;
-      slide.id = id;
-      reservedIds.add(id);
-    }
+    assignPageIds(slide, slides.length);
     assertValidPresentation({ slides: [slide] });
     slides.push(slide);
     pages.push({ slideIndex: sourceIndex + slides.length - 1, mappings, ...initial.furniture ? { repeatedMappings: repeatedMappings(slides.length - 1) } : {} });
@@ -209,35 +230,55 @@ function paginateSlide(input, options = {}) {
   if (!slides.length) throw new OPFPaginationError("No body content can be paginated.", initial.diagnostics);
   return { slides, pages };
 }
+var usesSlideTotal = (presentation) => [presentation, ...presentation.slides].some((owner) => ["header", "footer"].some((kind) => ["left", "center", "right"].some((zone) => {
+  const content = owner?.design?.[kind]?.[zone];
+  return content?.slideNumber === true && typeof content.slideNumberFormat === "string" && content.slideNumberFormat.includes("{total}");
+})));
 function paginatePresentation(input, options = {}) {
   assertValidPresentation(input);
   const presentation = clone(input);
   const maxSlides = options.maxSlides ?? 100;
   if (!Number.isInteger(maxSlides) || maxSlides < 1 || maxSlides > 1e4) throw new RangeError("maxSlides must be an integer between 1 and 10000.");
-  const output = [], pages = [];
-  const reservedIds = presentation.slides.map((slide) => slide.id).filter(Boolean);
+  const authoredIds = presentation.slides.flatMap((slide) => slideIds(slide));
   const resolve = (kind, id) => presentation.catalogs?.[kind]?.records?.find((record) => record.id === id) ?? catalogs[kind].find((record) => record.id === id);
-  presentation.slides.forEach((slide, index) => {
-    const overrides = options.slideOptions?.(slide, index) ?? {};
-    const layout = overrides.layout ?? (slide.layout ? resolve("layouts", slide.layout) : void 0);
-    if (slide.layout && !layout) throw new OPFPaginationError(`Layout '${slide.layout}' must be supplied inline or resolved by the host before pagination.`);
-    const design = { ...presentation.design, ...slide.design };
-    const reference = design.theme ?? "minimal";
-    const theme = typeof reference === "string" ? resolve("themes", reference) : { ...resolve("themes", reference.id), ...reference };
-    if (!theme) throw new OPFPaginationError(`Theme '${reference}' must be supplied inline before pagination.`);
-    if (output.length >= maxSlides) throw new OPFPaginationError(`Pagination needs more than ${maxSlides} slides. No partial result was returned.`);
-    const fontReference = design.fontScheme ?? theme.fontScheme ?? "roboto";
-    const fontScheme = typeof fontReference === "string" ? resolve("fontSchemes", fontReference) : { ...resolve("fontSchemes", fontReference.id), ...fontReference };
-    const fonts = resolveFontFamilies(fontScheme);
-    const result = paginateSlide(slide, { ...resolveCanvasDimensions(design.dimensions ?? theme.dimensions), layout, fonts, contentAlignment: design.contentAlignment, titleAlignment: design.titleAlignment, contentBox: design.contentBox, textMeasurement: options.textMeasurement, textRasterPadding: options.textRasterPadding, ...overrides, presentation, slideIndex: index, slideNumber: output.length + 1, maxSlides: maxSlides - output.length, minFontSize: options.minFontSize, reservedIds });
-    const outputStart = output.length;
-    result.pages.forEach((page, pageIndex) => {
-      const remap = (mapping) => ({ ...mapping, outputPath: mapping.outputPath.replace(/^slides\.\d+/, `slides.${outputStart + pageIndex}`) });
-      pages.push({ sourceSlideIndex: index, slideIndex: outputStart + pageIndex, mappings: page.mappings.map(remap), ...page.repeatedMappings ? { repeatedMappings: page.repeatedMappings.map(remap) } : {} });
+  const reported = /* @__PURE__ */ new Set();
+  const run = (slideCount2) => {
+    const output2 = [], pages2 = [], reservedIds = [...authoredIds];
+    presentation.slides.forEach((slide, index) => {
+      const overrides = options.slideOptions?.(slide, index) ?? {};
+      const layout = overrides.layout ?? (slide.layout ? resolve("layouts", slide.layout) : void 0);
+      if (slide.layout && !layout) throw new OPFPaginationError(`Layout '${slide.layout}' must be supplied inline or resolved by the host before pagination.`);
+      const design = { ...presentation.design, ...slide.design };
+      const reference = design.theme ?? "minimal";
+      const theme = typeof reference === "string" ? resolve("themes", reference) : { ...resolve("themes", reference.id), ...reference };
+      if (!theme) throw new OPFPaginationError(`Theme '${reference}' must be supplied inline before pagination.`);
+      if (output2.length >= maxSlides) throw new OPFPaginationError(`Pagination needs more than ${maxSlides} slides. No partial result was returned.`);
+      const fontReference = design.fontScheme ?? theme.fontScheme ?? DEFAULT_FONT_SCHEME;
+      const fontPath = slide.design?.fontScheme !== void 0 ? `slides.${index}.design.fontScheme` : presentation.design?.fontScheme !== void 0 ? "design.fontScheme" : slide.design?.theme !== void 0 ? `slides.${index}.design.theme` : "design.theme";
+      const { scheme: fontScheme, diagnostic } = resolveFontSchemeReference(fontReference, (id) => resolve("fontSchemes", id), fontPath);
+      if (diagnostic && !reported.has(diagnostic.path)) {
+        reported.add(diagnostic.path);
+        options.onDiagnostic?.(diagnostic);
+      }
+      const fonts = resolveFontFamilies(fontScheme);
+      const result2 = paginateSlide(slide, { ...resolveCanvasDimensions(design.dimensions ?? theme.dimensions), layout, fonts, contentAlignment: design.contentAlignment, titleAlignment: design.titleAlignment, contentBox: design.contentBox, textMeasurement: options.textMeasurement, textRasterPadding: options.textRasterPadding, socialPlatforms: catalogs.socialPlatforms, ...overrides, presentation, slideIndex: index, slideNumber: output2.length + 1, slideCount: slideCount2, date: options.date, maxSlides: maxSlides - output2.length, minFontSize: options.minFontSize, reservedIds });
+      const outputStart = output2.length;
+      result2.pages.forEach((page, pageIndex) => {
+        const remap = (mapping) => ({ ...mapping, outputPath: mapping.outputPath.replace(/^slides\.\d+/, `slides.${outputStart + pageIndex}`) });
+        pages2.push({ sourceSlideIndex: index, slideIndex: outputStart + pageIndex, mappings: page.mappings.map(remap), ...page.repeatedMappings ? { repeatedMappings: page.repeatedMappings.map(remap) } : {} });
+      });
+      output2.push(...result2.slides);
+      reservedIds.push(...result2.slides.flatMap((slide2) => slideIds(slide2)));
     });
-    output.push(...result.slides);
-    reservedIds.push(...result.slides.map((slide2) => slide2.id).filter(Boolean));
-  });
+    return { output: output2, pages: pages2 };
+  };
+  let slideCount = presentation.slides.length, result = run(slideCount);
+  for (let attempt = 0; usesSlideTotal(presentation) && result.output.length !== slideCount; attempt++) {
+    if (attempt >= 3) throw new OPFPaginationError("Slide-number totals did not converge. Change the slide-number format or split the input.");
+    slideCount = result.output.length;
+    result = run(slideCount);
+  }
+  const { output, pages } = result;
   presentation.slides = output;
   assertValidPresentation(presentation);
   return { presentation, pages };