@forevka/wordcanvas 0.7.0 → 0.7.1

package/dist-node/{chunk-IJLL6IFJ.js → chunk-RNB336F3.js}

@@ -9,7 +9,7 @@ import {
   formatListNumber,
   isHiddenParagraph,
   markerText
-} from "./chunk-XDUDPPJW.js";
+} from "./chunk-CDN6WU2P.js";
 import {
   charStyleToFont,
   fontMetrics,
@@ -3868,6 +3868,12 @@ var PrepareCache = class {
   evict(blockId) {
     this.map.delete(blockId);
   }
+  /** Drop every entry — used when the whole document is replaced (the importer
+   *  re-mints block ids from i0, so a stale entry at the same id+revision would
+   *  otherwise leak the previous document's prepared text into the new one). */
+  clear() {
+    this.map.clear();
+  }
   /** Drop every entry whose id is NOT in `keep` (paragraphs no longer in the
    *  document). Called after a full layout to bound the cache to live blocks. */
   retainOnly(keep) {
@@ -3910,6 +3916,10 @@ function createLayoutEngine() {
     evict(blockId) {
       prepCache.evict(blockId);
       linesCache.delete(blockId);
+    },
+    reset() {
+      prepCache.clear();
+      linesCache.clear();
     }
   };
 }
@@ -4379,7 +4389,7 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
         lines: getLines(block, colWidth - indentOf(block) - rightIndentOf(block) - gutter)
       });
     } else if (block.kind === "image") {
-      measured.push({ kind: "image", block, height: block.heightPx });
+      measured.push({ kind: "image", block, height: block.anchor ? 0 : block.heightPx });
     } else {
       const t = measureTable(block, colWidth, getLines, cellListCtx);
       measured.push({ kind: "table", block, ...t });
@@ -4610,7 +4620,59 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
     return { x0, width: Math.max(40, x1 - x0) };
   };
   const floatsActiveAt = (yy) => floats.some((f) => f.bottom > yy);
+  const placeAnchoredImage = (img) => {
+    const a = img.anchor;
+    let ox;
+    switch (a.relFromH) {
+      case "page":
+      case "leftMargin":
+        ox = 0;
+        break;
+      case "rightMargin":
+        ox = sec.pageWidthPx - sec.marginPx.right;
+        break;
+      case "column":
+        ox = colX();
+        break;
+      default:
+        ox = sec.marginPx.left;
+        break;
+    }
+    let oy;
+    switch (a.relFromV) {
+      case "page":
+      case "topMargin":
+        oy = 0;
+        break;
+      case "bottomMargin":
+        oy = sec.pageHeightPx - sec.marginPx.bottom;
+        break;
+      case "paragraph":
+      case "line":
+        oy = y;
+        break;
+      // current flow position
+      default:
+        oy = sec.marginPx.top;
+        break;
+    }
+    const placedImage = { src: img.src, width: img.widthPx, height: img.heightPx, z: a.z ?? 0 };
+    if (a.behind) placedImage.behind = true;
+    else placedImage.front = true;
+    page.blocks.push({
+      blockId: img.id,
+      x: ox + a.offsetXPx,
+      y: oy + a.offsetYPx,
+      firstLineIndex: 0,
+      lines: [],
+      image: placedImage
+    });
+  };
   const placeImage = (img) => {
+    if (img.anchor) {
+      placeAnchoredImage(img);
+      return;
+    }
     if (y + img.heightPx > bottomY() && colHasContent()) newPage();
     const floating = img.wrap === "square" && img.align !== "center";
     const slack = colWidth - img.widthPx;
@@ -4638,7 +4700,10 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       if (placed === null) {
         placed = { blockId: p.id, x: colX() + indentOf(p), y, firstLineIndex: lineIdx, lines: [] };
         const marker = lineIdx === 0 ? markers.get(p.id) : void 0;
-        if (marker) placed.marker = { text: marker.text, style: marker.style, x: placed.x - marker.hangingPx };
+        if (marker) {
+          const firstX = frags[0]?.frag.x ?? 0;
+          placed.marker = { text: marker.text, style: marker.style, x: placed.x + firstX - marker.hangingPx };
+        }
         page.blocks.push(placed);
       }
       const box = { y: y - placed.y, height, ascent, fragments: frags.map((rf) => rf.frag) };
@@ -4752,10 +4817,14 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       startSectionPage();
     }
     const m = measured[bi];
-    const atomicKind = (x) => x?.kind === "table" || x?.kind === "image";
+    const atomicKind = (x) => x?.kind === "table" || x?.kind === "image" && x.block.anchor === void 0;
     const prevAtomic = atomicKind(measured[bi - 1]);
     const nextAtomic = atomicKind(measured[bi + 1]);
     if (m.kind === "image") {
+      if (m.block.anchor) {
+        placeImage(m.block);
+        continue;
+      }
       if (!prevAtomic) y += ATOMIC_GAP;
       placeImage(m.block);
       if (!nextAtomic && (m.block.wrap !== "square" || m.block.align === "center")) y += ATOMIC_GAP;
@@ -4860,6 +4929,19 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       }
     }
   }
+  for (const pg of pages) {
+    if (!pg.blocks.some((b) => b.image?.behind || b.image?.front)) continue;
+    const layer = (b) => b.image?.behind ? 0 : b.image?.front ? 2 : 1;
+    pg.blocks = pg.blocks.map((b, i) => ({ b, i })).sort((p, q) => {
+      const dl = layer(p.b) - layer(q.b);
+      if (dl !== 0) return dl;
+      if (layer(p.b) !== 1) {
+        const dz = (p.b.image.z ?? 0) - (q.b.image.z ?? 0);
+        if (dz !== 0) return dz;
+      }
+      return p.i - q.i;
+    }).map((x) => x.b);
+  }
   const pageNumbers = [];
   {
     let n = 0;
@@ -4872,6 +4954,35 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       pages[i].number = n;
     }
   }
+  const fieldDefs = doc.fields;
+  if (fieldDefs) {
+    const isPageNumField = (fid) => {
+      if (fid === void 0) return false;
+      const def = fieldDefs[fid];
+      const t = def && def.kind === "builtin" ? def.spec?.type : void 0;
+      return t === "PAGE" || t === "NUMPAGES";
+    };
+    const resolveLineTokens = (line, pageNum) => {
+      let dx = 0;
+      for (const frag of line.fragments) {
+        if (dx !== 0) frag.x += dx;
+        if (!isPageNumField(frag.style.fieldId)) continue;
+        const sub = substituteTokens(frag.text, pageNum, pages.length);
+        if (sub === frag.text) continue;
+        const modelLen = frag.endOffset - frag.startOffset;
+        const oldWidth = frag.width;
+        frag.text = sub;
+        frag.width = measureTextWidth(sub, charStyleToFont(frag.style));
+        frag.offsetMap = Array.from({ length: sub.length + 1 }, (_v, i) => i === sub.length ? modelLen : 0);
+        dx += frag.width - oldWidth;
+      }
+    };
+    const resolveBlockTokens = (b, pageNum) => {
+      for (const line of b.lines) resolveLineTokens(line, pageNum);
+      if (b.table) for (const row of b.table.rows) for (const cell of row.cells) for (const cb of cell.blocks) resolveBlockTokens(cb, pageNum);
+    };
+    for (const pg of pages) for (const b of pg.blocks) resolveBlockTokens(b, pageNumbers[pg.index]);
+  }
   if (tocPlacements.size > 0) {
     const firstPageOf = /* @__PURE__ */ new Map();
     const mapPage = (blocks, num) => {
@@ -5200,4 +5311,4 @@ export {
   effectiveSection,
   resolveSections
 };
-//# sourceMappingURL=chunk-IJLL6IFJ.js.map
+//# sourceMappingURL=chunk-RNB336F3.js.map