@openpresentation/opf 0.18.4 → 0.19.0

package/dist/{chunk-FO3WGS4R.js → chunk-OVBGGGKO.js}

@@ -1,6 +1,5 @@
-import { assertValid, resolveSlideScriptMeasurement, resolveSlideContext } from './chunk-KA3ZPFVT.js';
-import { resolveSlideVariables, usesSlideBuiltin, composeSlide, codeHighlightSlice, tableRowBoundaries, visitContentPayloads, slideTokenSpans, sliceNumberedItems } from './chunk-MBU42S5Y.js';
-import { checkCatalogsOption } from './chunk-SPFV27O5.js';
+import { assertValid, resolveSlideScriptMeasurement, resolveSlideContext } from './chunk-65GDO6TJ.js';
+import { resolveSlideVariables, checkCatalogsOption, usesSlideBuiltin, composeSlide, codeHighlightSlice, tableRowBoundaries, visitContentPayloads, regionAccepts, slideTokenSpans, sliceNumberedItems } from './chunk-ZPCKGGI6.js';
 
 // src/pagination.ts
 var OPFPaginationError = class extends Error {
@@ -110,16 +109,6 @@ function paginateSlide(input, options = {}) {
   const { fonts, catalogs, minFontSize: _minFontSize, maxSlides: _maxSlides, reservedIds: _reservedIds, ...engineOptions } = options;
   const textMeasurement = fonts?.textMeasurement && options.presentation !== void 0 ? resolveSlideScriptMeasurement(options.presentation, sourceIndex, fonts.textMeasurement, { ...catalogs !== void 0 ? { catalogs } : {}, ...options.fontFamilies ? { fontFamilies: options.fontFamilies } : {} }) : fonts?.textMeasurement;
   const composeOptions = { ...engineOptions, ...textMeasurement ? { textMeasurement } : {} };
-  const readableLayout = (layout) => {
-    if (!isRecord(layout) || !Array.isArray(layout.placeholders) || !layout.placeholders.some((entry) => isRecord(entry) && entry.type === "group")) return layout;
-    const visit = (entries) => entries.map((entry) => {
-      if (!isRecord(entry) || entry.type !== "group") return entry;
-      const own = isRecord(entry.composition) ? entry.composition : {};
-      return { ...entry, composition: { ...own, ...typeof own.minFontSize === "number" ? { minFontSize: Math.max(minFontSize, own.minFontSize) } : {}, overflow: "warn" }, placeholders: Array.isArray(entry.placeholders) ? visit(entry.placeholders) : entry.placeholders };
-    });
-    return { ...layout, placeholders: visit(layout.placeholders) };
-  };
-  if (options.layout !== void 0) composeOptions.layout = readableLayout(options.layout);
   const presentationSlides = options.presentation?.slides;
   const slideCount = options.slideCount ?? (Array.isArray(presentationSlides) && presentationSlides.length ? presentationSlides.length : void 0);
   const logoContext = options.presentation !== void 0 ? { presentation: options.presentation, darkBackground: options.darkBackground === true } : {};
@@ -129,7 +118,18 @@ function paginateSlide(input, options = {}) {
     return composeSlide(resolveSlideVariables(withReadability(slide, true), { slideNumber, ...slideCount !== void 0 ? { slideCount } : {}, ...logoContext }), { ...composeOptions, slideNumber });
   };
   const initial = geometry(source);
-  const fit = (diagnostics) => diagnostics.filter((issue) => issue.code === "text-overflow" || issue.code === "small-cell" || !!initial.furniture?.diagnostics.includes(issue));
+  const movable = (issue) => {
+    if (issue.region !== void 0) return true;
+    const match = /^slides\.\d+\.blocks\.(\d+)$/.exec(issue.path);
+    const block = match && Array.isArray(source.blocks) ? source.blocks[Number(match[1])] : void 0;
+    return block !== void 0 && (initial.regions ?? []).some((region) => regionAccepts(region, block));
+  };
+  const fit = (diagnostics) => diagnostics.filter((issue) => issue.code === "text-overflow" || issue.code === "small-cell" || issue.code === "layout-unplaced" && movable(issue) || !!initial.furniture?.diagnostics.includes(issue));
+  const regionOfBlock = /* @__PURE__ */ new Map();
+  for (const region of initial.regions ?? []) for (const content of [...region.content, ...region.overflow ?? []]) {
+    const match = /\.blocks\.(\d+)$/.exec(content);
+    if (match) regionOfBlock.set(Number(match[1]), { name: region.name, accepts: region.accepts });
+  }
   const repeatedMappings = (pageIndex) => {
     if (!initial.furniture) return [];
     const paths = new Set(initial.items.filter((item) => headingFields.has(item.field)).map((item) => item.path));
@@ -149,7 +149,13 @@ function paginateSlide(input, options = {}) {
     for (const key of path.slice(sourceBase.length + 1).split(".")) node = isRecord(node) || Array.isArray(node) ? node[key] : void 0;
     return node === void 0 ? fallback : node;
   };
-  const leaves = initial.items.filter((item) => !headingFields.has(item.field)).map((item) => leafFor(item.path, item.field, sourceValue(item.path, item.value)));
+  const blockIndex = (path) => {
+    const match = /^slides\.\d+\.blocks\.(\d+)/.exec(path);
+    return match ? Number(match[1]) : -1;
+  };
+  const bodyItems = initial.items.filter((item) => !headingFields.has(item.field));
+  if (initial.regions) bodyItems.sort((a, b) => blockIndex(a.path) - blockIndex(b.path));
+  const leaves = bodyItems.map((item) => leafFor(item.path, item.field, sourceValue(item.path, item.value)));
   const leafPaths = new Set(leaves.map((leaf) => leaf.path));
   const slides = [], pages = [];
   let selected = /* @__PURE__ */ new Map();
@@ -192,7 +198,10 @@ function paginateSlide(input, options = {}) {
           const children = [];
           value.forEach((child, index) => {
             const projected = visit(child, `${childPath}.${index}`, `${outputPath}.${children.length}`);
-            if (projected) children.push(projected);
+            if (!projected) return;
+            const region = root && pageIndex > 0 && projected.region === void 0 ? regionOfBlock.get(index) : void 0;
+            if (region && regionAccepts(region, projected)) projected.region = region.name;
+            children.push(projected);
           });
           if (children.length) {
             result.blocks = children;