gutterpress 0.11.23-beta.1 → 0.11.23-beta.3

package/dist/{index-cw03e9p4.js → index-kw4tbthz.js}

@@ -2,7 +2,7 @@ import {
   EXTENSIONS_DIR,
   LEGACY_PLUGINS_DIR,
   VENDORED_NPM_DIR
-} from "./index-5x42amh8.js";
+} from "./index-g3te5ey1.js";
 import {
   capabilitiesFor,
   detectProjectSource,
@@ -423,6 +423,40 @@ class LocalFolderSourceProvider {
     return Promise.reject(new Error(NO_VERSION_HISTORY));
   }
 }
+var lastHistoryWalk = null;
+async function startHistoryWalk(dir, cache, heads) {
+  const shallow = await gitFs.promises.readFile(path2.join(gitDirFor(dir), "shallow"), "utf8").catch(() => "");
+  const tips = await Promise.all(heads.map((oid) => git.readCommit({ fs: gitFs, dir, cache, oid })));
+  tips.sort((a, b) => a.commit.committer.timestamp - b.commit.committer.timestamp);
+  return {
+    tips,
+    queued: new Set(heads),
+    shallow: new Set(shallow.split(`
+`)),
+    readAhead: new Map
+  };
+}
+async function nextInHistory(dir, walk, cache, needed) {
+  const commit = walk.tips.pop();
+  if (!commit || walk.shallow.has(commit.oid))
+    return commit;
+  for (const oid of commit.commit.parent) {
+    if (walk.queued.has(oid))
+      continue;
+    const oneLine = walk.tips.length === 0 && commit.commit.parent.length === 1;
+    if (needed > 1 && oneLine && !walk.readAhead.has(oid)) {
+      for (const c of await git.log({ fs: gitFs, dir, cache, ref: oid, depth: needed })) {
+        if (!walk.queued.has(c.oid))
+          walk.readAhead.set(c.oid, c);
+      }
+    }
+    walk.queued.add(oid);
+    walk.tips.push(walk.readAhead.get(oid) ?? await git.readCommit({ fs: gitFs, dir, cache, oid }));
+    walk.readAhead.delete(oid);
+  }
+  walk.tips.sort((a, b) => a.commit.committer.timestamp - b.commit.committer.timestamp);
+  return commit;
+}
 
 class LocalGitSourceProvider {
   source;
@@ -460,40 +494,46 @@ class LocalGitSourceProvider {
     const dir = this.dir;
     const limit = Math.min(500, Math.max(1, options.limit ?? HISTORY_PAGE_LIMIT));
     const before = options.before;
-    let commits;
+    const cache = {};
     try {
-      commits = await git.log({
-        fs: gitFs,
-        dir,
-        cache: {},
-        depth: limit + 2,
-        ...before ? { ref: before } : {}
-      });
+      const head = await git.resolveRef({ fs: gitFs, dir, ref: "HEAD" });
+      let walk;
+      const saved = lastHistoryWalk;
+      if (before && saved?.dir === dir && saved.head === head && saved.last === before) {
+        walk = saved.walk;
+        lastHistoryWalk = null;
+      } else {
+        walk = await startHistoryWalk(dir, cache, [head]);
+        if (before) {
+          let c;
+          do {
+            c = await nextInHistory(dir, walk, cache, limit);
+          } while (c && c.oid !== before);
+          if (!c)
+            return { entries: [], hasMore: false };
+        }
+      }
+      const entries = [];
+      while (entries.length < limit) {
+        const c = await nextInHistory(dir, walk, cache, limit - entries.length);
+        if (!c)
+          break;
+        entries.push({
+          id: c.oid,
+          message: c.commit.message.trim(),
+          timestamp: c.commit.author.timestamp * 1000,
+          author: c.commit.author.name
+        });
+      }
+      const hasMore = walk.tips.length > 0;
+      lastHistoryWalk = hasMore ? { dir, head, last: entries.at(-1).id, walk } : null;
+      return { entries, hasMore };
     } catch (e) {
       if (before && e?.code === "NotFoundError") {
         return { entries: [], hasMore: false };
       }
       throw e;
     }
-    const seen = new Set;
-    let filtered = commits.filter((c) => {
-      if (c.oid === before || seen.has(c.oid))
-        return false;
-      seen.add(c.oid);
-      return true;
-    });
-    const hasMore = filtered.length > limit;
-    if (hasMore)
-      filtered = filtered.slice(0, limit);
-    return {
-      entries: filtered.map((c) => ({
-        id: c.oid,
-        message: c.commit.message.trim(),
-        timestamp: c.commit.author.timestamp * 1000,
-        author: c.commit.author.name
-      })),
-      hasMore
-    };
   }
   restore(options) {
     return withRepoLock(this.dir, () => this.restoreUnlocked(options));
@@ -793,4 +833,4 @@ async function switchBranch(options) {
   });
 }
 
-export { gitFs, errorLogData, resolveLogger, gitScopeFor, HISTORY_PAGE_LIMIT, NO_VERSION_HISTORY, withRepoLock, whenGitIdle, __repoLockQueueSizeForTests, resolveGitAuthor, listWorkdirChanges, stageChanges, hasPendingChanges, hasUncommittedChanges, snapshotWorkingTreeUnlocked, isNoChangesError, countUnversionedChanges, providerFor, gitDirFor, snapshotStagingMarkerPath, RESTORE_BACKUP_MESSAGE, AUTO_SNAPSHOT_MESSAGE, restoreVersionWithBackup, SWITCH_BRANCH_SNAPSHOT_MESSAGE, readRevisionRefs, isContained, listRevisions, revisionNameFrom, assertFreeRevisionName, createRevision, switchBranch };
+export { gitFs, errorLogData, resolveLogger, gitScopeFor, HISTORY_PAGE_LIMIT, NO_VERSION_HISTORY, withRepoLock, whenGitIdle, __repoLockQueueSizeForTests, resolveGitAuthor, listWorkdirChanges, stageChanges, hasPendingChanges, hasUncommittedChanges, startHistoryWalk, nextInHistory, snapshotWorkingTreeUnlocked, isNoChangesError, countUnversionedChanges, providerFor, gitDirFor, snapshotStagingMarkerPath, RESTORE_BACKUP_MESSAGE, AUTO_SNAPSHOT_MESSAGE, restoreVersionWithBackup, SWITCH_BRANCH_SNAPSHOT_MESSAGE, readRevisionRefs, isContained, listRevisions, revisionNameFrom, assertFreeRevisionName, createRevision, switchBranch };

package/dist/{index-fk2kpf2t.js → index-santcs4q.js}

@@ -19,7 +19,7 @@ import {
   stringValueAt,
   toFolioPage,
   wantsRecto
-} from "./index-798jt0qc.js";
+} from "./index-d9w3r89w.js";
 import {
   round3
 } from "./index-tayzfr9c.js";
@@ -312,12 +312,14 @@ function needsMeasurement(value) {
 
 // src/engine/shared/pdf-inspect.ts
 import {
+  decodePDFRawStream,
   PDFArray,
   PDFDict,
   PDFDocument,
   PDFHexString,
   PDFName,
   PDFNumber,
+  PDFRawStream,
   PDFRef,
   PDFString
 } from "pdf-lib";
@@ -438,6 +440,52 @@ async function inspectPdf(bytes) {
   walkOutline(outlines);
   return { pageCount: pages.length, boxes, linkTargets, namedDests, outline };
 }
+var PROLOGUE = /^\s*(\d*\.?\d+) 0 0 -\d*\.?\d+ -?\d*\.?\d+ -?\d*\.?\d+ cm/;
+var CLIP = /(-?\d*\.?\d+) (-?\d*\.?\d+) (\d*\.?\d+) (\d*\.?\d+) re\s+W\*? n\b/g;
+var UNIFORM = /\bq\s+(\d*\.?\d+) 0 0 \1 (-?\d*\.?\d+) -?\d*\.?\d+ cm/g;
+var UNSCALED_EPSILON = 0.000001;
+function printScale(doc) {
+  const readings = new Map;
+  for (const page of doc.getPages()) {
+    const contents = page.node.Contents();
+    const streams = contents instanceof PDFArray ? contents.asArray().map((ref) => doc.context.lookup(ref)) : [contents];
+    let text = "";
+    for (const stream of streams) {
+      if (!(stream instanceof PDFRawStream))
+        continue;
+      try {
+        text += Buffer.from(decodePDFRawStream(stream).decode()).toString("latin1") + `
+`;
+      } catch {}
+    }
+    const prologue = PROLOGUE.exec(text);
+    if (!prologue)
+      continue;
+    let area;
+    for (const m of text.matchAll(CLIP)) {
+      const size = Number(m[3]) * Number(m[4]);
+      if (!area || size > area.size)
+        area = { x: Number(m[1]), size, end: m.index + m[0].length };
+    }
+    if (!area)
+      continue;
+    UNIFORM.lastIndex = area.end;
+    for (let m;m = UNIFORM.exec(text); ) {
+      if (Math.abs(Number(m[2]) - area.x) > 0.5)
+        continue;
+      const scale = Number(m[1]) * Number(prologue[1]) * 96 / 72;
+      readings.set(scale, (readings.get(scale) ?? 0) + 1);
+      break;
+    }
+    if ([...readings.values()].some((n) => n >= 3))
+      break;
+  }
+  let best = null;
+  for (const [scale, n] of readings)
+    if (best === null || n > readings.get(best))
+      best = scale;
+  return best === null ? null : Math.abs(1 - best) < UNSCALED_EPSILON ? 1 : best;
+}
 
 // src/engine/compiler/tier2.ts
 var DEFAULT_SLUG_PT = 18;
@@ -584,6 +632,7 @@ function round(n) {
 import { PDFDocument as PDFDocument2, PDFName as PDFName2, PDFNumber as PDFNumber2, rgb } from "pdf-lib";
 async function postprocess(input, opts) {
   const doc = await PDFDocument2.load(input, { updateMetadata: false });
+  const scale = printScale(doc);
   const g = opts.geometry;
   const inset = g.bleed + g.slug;
   const media = [0, 0, g.media.width, g.media.height];
@@ -630,7 +679,8 @@ async function postprocess(input, opts) {
     bytes,
     pageCount: doc.getPageCount(),
     padded,
-    boxes: { media, bleed: bleedBox, trim: trimBox }
+    boxes: { media, bleed: bleedBox, trim: trimBox },
+    scale
   };
 }
 function drawCropMarks(page, g) {
@@ -934,8 +984,6 @@ ${pinCss}`);
       const msg = `${headline}:
 ${describe(widthOffenders.boxes)}`;
       if (opts.allowShrink) {
-        if (scale !== null)
-          diagnose("engine.width.overflow", `${headline}.`);
         for (const o of widthOffenders.boxes)
           diagnose("engine.width.overflow", `${o.desc} is ${Math.round(o.px)}px wide, past the ${Math.round(widthOffenders.limitPx)}px page content box. ${o.left < -1 ? "Keep it inside the page content box." : "Give it an explicit width that fits."}`);
         log(`WARNING: ${msg}`);
@@ -951,6 +999,54 @@ ${describe(widthOffenders.intrinsics)}`;
         diagnose("engine.width.intrinsic", `${o.desc} has no width set and is naturally wider than the page — if the printed output comes out smaller than your CSS says, give it an explicit width (e.g. width: 100%).`);
       log(`WARNING: ${msg}`);
     }
+    let unclipped = null;
+    if (!widthOffenders.boxes.length) {
+      const g = tier2.geometry;
+      const ext = g.bleed + g.slug;
+      const contentPx = (name, pseudos) => {
+        const { width, margin } = resolvePage(model, { name: name || undefined, pseudos }).geometry;
+        return (width + 2 * ext - bleedMargin(margin.left, g) - bleedMargin(margin.right, g)) * 96 / 72;
+      };
+      const pages = await page.evaluate(`(() => {
+        const body = document.body;
+        const named = (el) => { const p = getComputedStyle(el).page; return p && p !== "auto" ? p : ""; };
+        if (!body) return { first: "", used: [], reason: "there is no body" };
+        const bs = getComputedStyle(body);
+        const r = body.getBoundingClientRect();
+        if (
+          Math.abs(r.left + parseFloat(bs.borderLeftWidth)) > 0.01 ||
+          Math.abs(r.right - parseFloat(bs.borderRightWidth) - window.innerWidth) > 0.01
+        ) return { first: "", used: [], reason: "the body does not span the page content box" };
+        // The first page's name: the root's, overridden down the chain of
+        // first in-flow children (CSS Paged Media's start page value).
+        let first = named(document.documentElement) || named(body);
+        for (let el = body; el; ) {
+          el = [...el.children].find((c) => {
+            const cs = getComputedStyle(c);
+            return cs.display !== "none" && cs.position !== "absolute" && cs.position !== "fixed";
+          });
+          if (el && named(el)) first = named(el);
+        }
+        const used = new Set([""]);
+        for (const el of document.querySelectorAll("*")) used.add(named(el));
+        return { first, used: [...used], reason: "" };
+      })()`);
+      const firstPx = contentPx(pages.first, ["first", "right", "recto"]);
+      const wider = pages.used.find((name) => pseudoContexts.some((pseudos) => contentPx(name, pseudos) > firstPx + 0.01));
+      unclipped = pages.reason || (wider !== undefined ? `${wider ? `the page "${wider}"` : "the unnamed page"} is wider than the first page` : await page.evaluate(`(() => {
+              const hs = getComputedStyle(document.documentElement);
+              const bs = getComputedStyle(document.body);
+              let css;
+              if (hs.overflowX === "visible" && hs.overflowY === "visible")
+                css = "html { overflow-x: clip !important; } " +
+                  "body { overflow-x: clip !important; overflow-y: visible !important; }";
+              else if (bs.overflowX === "visible") css = "body { overflow-x: clip !important; }";
+              else return "the body clips its own overflow";
+              window.__gp.addCss("gp-root-clip", css);
+              return "";
+            })()`)) || null;
+      log(`body overflow ${unclipped ? `left as authored: ${unclipped}` : "held to the page content box"}`);
+    }
     const rectoDecls = model.breaks.filter(isRectoVersoBreak);
     const needsMeasure = tier3Reasons.length > 0 || consumedStrings(model).size > 0 || rectoDecls.length > 0 || model.counterResets.length > 0 || furnitureRoots.length > 0 || sideRoots.length > 0;
     let tier = tier2.geometry.bleed > 0 || tier2.geometry.slug > 0 ? 2 : 1;
@@ -1472,6 +1568,20 @@ ${mapCss}`;
       author: opts.author
     });
     log(`postprocess: ${post.pageCount} pages` + (post.padded ? ` (+${post.padded} blank${opts.lastPage ? `; last page: ${opts.lastPage}` : ""})` : ""));
+    {
+      const scale = post.scale;
+      if (scale !== null && scale < 1) {
+        const pct = (scale * 100).toPrecision(6);
+        const overPx = widthOffenders.defaultLimitPx * (1 / scale - 1);
+        diagnose("engine.width.overflow", `This book printed at ${pct}% of its declared size: content reaches about ` + `${overPx < 0.1 ? overPx.toFixed(3) : overPx.toFixed(2)}px past the ` + `${Math.round(widthOffenders.defaultLimitPx)}px page content box, and Chromium shrinks ` + `the WHOLE print to fit it. The preview is not shrunk, so its lines and page ` + `breaks can differ from the PDF's.` + (unclipped ? ` Gutterpress could not hold it at the page content box: ${unclipped}.` : ""));
+        if (!widthOffenders.boxes.length) {
+          const named = await findWidthOffenders(page, model, 2 * (tier2.geometry.bleed + tier2.geometry.slug), sheetViewport, 0);
+          for (const o of named.boxes)
+            diagnose("engine.width.overflow", `${o.desc} reaches ${Math.max(o.px + Math.min(0, o.left) - (o.limit ?? named.limitPx), -o.left).toFixed(2)}px ` + `past the ${Math.round(o.limit ?? named.limitPx)}px page content box. Keep it ` + `inside the page content box.`);
+        }
+        log(`audit: printed at ${pct}% (shrink-to-fit)`);
+      }
+    }
     return {
       bytes: post.bytes,
       tier,
@@ -1506,7 +1616,7 @@ function shrinkScale(boxes, limitPx) {
     return null;
   return Math.max(1 / MAX_SHRINK, limitPx / maxRight);
 }
-async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreViewport) {
+async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreViewport, tolerancePx = 1) {
   const contexts = [
     resolvePage(model),
     ...model.pageNames.filter((n) => !n.startsWith("gp-") || n.startsWith("gp--pin-")).map((n) => resolvePage(model, { name: n }))
@@ -1532,7 +1642,8 @@ async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreView
         mobile: false
       });
       boxes.push(...JSON.parse(await page.evaluate(`(() => {
-        const LIMIT = ${widthPx} + 1;
+        const TOL = ${tolerancePx};
+        const LIMIT = Math.max(${widthPx} + TOL, ${Math.ceil(widthPx)});
         const NAMED = ${JSON.stringify(namedLimits)};
         const DEFAULT_LIMIT = ${defaultLimitPx};
         // The page an element lands on: the nearest ancestor with a non-auto
@@ -1572,10 +1683,10 @@ async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreView
           // pulls) AND left-edge protrusion (negative left with an ordinary
           // width) — both trigger the same whole-document shrink-to-fit,
           // measured: a left bleed alone cost 16%.
-          if (right <= LIMIT && r.width <= LIMIT && r.left >= -1) continue;
+          if (right <= LIMIT && r.width <= LIMIT && r.left >= -TOL) continue;
           // ...but only where it actually escapes its clipping ancestors.
           const clip = clipEdges(el).edges;
-          if (Math.min(right, clip.right) <= LIMIT && Math.max(r.left, clip.left) >= -1) continue;
+          if (Math.min(right, clip.right) <= LIMIT && Math.max(r.left, clip.left) >= -TOL) continue;
           let deepest = true;
           for (const c of el.children) {
             if (c.getBoundingClientRect().width >= r.width - 1) { deepest = false; break; }
@@ -1612,7 +1723,7 @@ async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreView
           const over = el.scrollWidth - el.clientWidth;
           // clientWidth is 0 on inline/replaced boxes, where scrollWidth
           // carries no overflow information -- skip rather than guess.
-          if (el.clientWidth <= 0 || over <= 1) continue;
+          if (el.clientWidth <= 0 || over <= TOL) continue;
           // A descendant assigned to a DIFFERENT page is not overflowing this
           // element's page -- it is laid out against its own, wider one. The
           // full-bleed art plate is the standard case: it is legitimately
@@ -1666,7 +1777,7 @@ async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreView
         }
         return JSON.stringify(out);
       })()`));
-    return { limitPx, boxes, intrinsics: replaced };
+    return { limitPx, defaultLimitPx, boxes, intrinsics: replaced };
   } finally {
     await page.send("Emulation.setDeviceMetricsOverride", restoreViewport);
   }