gutterpress 0.11.23-alpha.7 → 0.11.23-beta.1

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

@@ -19,7 +19,10 @@ import {
   stringValueAt,
   toFolioPage,
   wantsRecto
-} from "./index-2vxzxyyj.js";
+} from "./index-798jt0qc.js";
+import {
+  round3
+} from "./index-tayzfr9c.js";
 import {
   launchChromium
 } from "./index-bt0qws5c.js";
@@ -86,6 +89,33 @@ function marginBoxesOnEdges(edges) {
   return Object.entries(owners).filter(([, own]) => own.some((e) => edges.includes(e))).map(([name]) => name);
 }
 
+// src/engine/shared/page-vars.ts
+var decls = (pairs) => pairs.map(([name, n]) => `--gp-page-${name}: ${round3(n)}pt;`).join(" ");
+function pageDecls(model, name) {
+  const { width, height, margin } = resolvePage(model, { name, pseudos: ["right"] }).geometry;
+  return decls([
+    ["width", width],
+    ["height", height],
+    ["margin-top", margin.top],
+    ["margin-bottom", margin.bottom],
+    ["margin-inside", margin.left],
+    ["margin-outside", margin.right]
+  ]);
+}
+function pageGeometryVarsCss(model, area) {
+  const bookWide = decls([
+    ["bleed", area?.bleed ?? 0],
+    ["safe", area?.safe ?? 0],
+    ["gutter", area?.gutter ?? 0],
+    ["art-safe", area?.artSafe ?? 0]
+  ]);
+  return [
+    `:root { ${pageDecls(model)} ${bookWide} }`,
+    ...model.pageAssignments.map((a) => `${a.selector} { ${pageDecls(model, a.page)} }`)
+  ].join(`
+`);
+}
+
 // src/engine/shared/content-value.ts
 var FUNC = /^([a-z-]+)\(/i;
 function parseContent(value) {
@@ -442,9 +472,9 @@ function pseudoVariants(model) {
 function consumedStrings(model) {
   const names = new Set;
   for (const rule of model.pageRules)
-    for (const decls of Object.values(rule.marginBoxes))
-      if (decls.content) {
-        for (const part of parseContent(decls.content))
+    for (const decls2 of Object.values(rule.marginBoxes))
+      if (decls2.content) {
+        for (const part of parseContent(decls2.content))
           if (part.type === "string")
             names.add(part.name);
       }
@@ -788,7 +818,8 @@ async function build(opts) {
         key: root.key
       });
     }
-    const printArea = pinRoots.length ? await page.evaluate(`window.__gp.printArea()`) : null;
+    const printArea = await page.evaluate(`window.__gp.printArea()`);
+    const geometryVarsCss = pageGeometryVarsCss(model, printArea);
     const pinStyle = (group, pseudos) => pinRootStyle(resolvePage(model, { name: group.authorPage, pseudos }).geometry.margin, printArea, pseudos.includes("left") ? "verso" : "recto", group.edges, group.padding);
     if (pinGroups.size) {
       const lines = [];
@@ -808,11 +839,11 @@ async function build(opts) {
             const body = [];
             for (const [prop, value] of Object.entries(rule.decls))
               body.push(`  ${prop}: ${value};`);
-            for (const [box, decls] of Object.entries(rule.marginBoxes)) {
+            for (const [box, decls2] of Object.entries(rule.marginBoxes)) {
               if (relocated.has(box.slice(1)))
                 continue;
               body.push(`  ${box} {`);
-              for (const [prop, value] of Object.entries(decls))
+              for (const [prop, value] of Object.entries(decls2))
                 body.push(`    ${prop}: ${value};`);
               body.push(`  }`);
             }
@@ -855,11 +886,12 @@ ${pinCss}`);
     const minContentHeightPx = Math.min(contentHeightPt(), ...model.pageNames.map((name) => contentHeightPt(name))) * 96 / 72;
     const pageVarsCss = [
       `:root { --gp-content-h: ${contentHeightPx}px; }`,
-      ...model.pageAssignments.map((a) => `${a.selector} { --gp-content-h: ${namedContentHeightsPx[a.page] ?? contentHeightPx}px; }`)
+      ...model.pageAssignments.map((a) => `${a.selector} { --gp-content-h: ${namedContentHeightsPx[a.page] ?? contentHeightPx}px; }`),
+      geometryVarsCss
     ].join(`
 `);
     await page.evaluate(`window.__gp.addCss("gp-page-vars", ${JSON.stringify(pageVarsCss)})`);
-    log(`page geometry published (--gp-content-h: ${Math.round(contentHeightPx)}px)`);
+    log(`page geometry published (--gp-content-h: ${Math.round(contentHeightPx)}px, --gp-page-*)`);
     const relocationBoxes = (group, pseudos) => {
       const ctx = resolvePage(model, { name: group.authorPage, pseudos });
       return marginBoxesOnEdges(group.edges).map((name) => [name, ctx.marginBoxes[`@${name}`]]).filter((pair) => {
@@ -1063,8 +1095,8 @@ ${mapCss}`;
             const g = ctx.geometry;
             const eff = flushMargins(g.margin, group.edges);
             const boxes = [];
-            for (const [name, decls] of relocationBoxes(group, pseudos)) {
-              const text = evaluate(decls.content, {
+            for (const [name, decls2] of relocationBoxes(group, pseudos)) {
+              const text = evaluate(decls2.content, {
                 page: toFolioPage(physical, pageValues),
                 pages: pageCount,
                 strings: (n, w) => stringValueAt(byName.get(n) ?? [], physical, parseWhich(w)),
@@ -1076,13 +1108,13 @@ ${mapCss}`;
               if (!text) {
                 if (!relocationDiagnosed.has(name)) {
                   relocationDiagnosed.add(name);
-                  diagnose("engine.pin.margin-box", `@${name} sits on an edge a pinned image frees, and its content could not be ` + `re-homed into the page (unsupported content value: ${decls.content}). It will ` + `not print on that page — simplify the box's content, or pin the image to another edge.`);
+                  diagnose("engine.pin.margin-box", `@${name} sits on an edge a pinned image frees, and its content could not be ` + `re-homed into the page (unsupported content value: ${decls2.content}). It will ` + `not print on that page — simplify the box's content, or pin the image to another edge.`);
                 }
                 continue;
               }
               const r = marginBoxRectPt(name, g);
               const outDecls = {};
-              for (const [prop, value] of Object.entries(decls)) {
+              for (const [prop, value] of Object.entries(decls2)) {
                 if (prop.toLowerCase() === "content" || isIgnoredMarginBoxProperty(prop))
                   continue;
                 outDecls[prop] = value;
@@ -1717,10 +1749,10 @@ function counterStyleCss(model, sources, pageMap, pageCount, resetSites = [], ha
     return "";
   const pairs = new Map;
   for (const rule of model.pageRules) {
-    for (const decls of Object.values(rule.marginBoxes)) {
-      if (!decls.content)
+    for (const decls2 of Object.values(rule.marginBoxes)) {
+      if (!decls2.content)
         continue;
-      for (const part of parseContent(decls.content)) {
+      for (const part of parseContent(decls2.content)) {
         if (part.type !== "string" || !byName.has(part.name))
           continue;
         const which = parseWhich(part.which);
@@ -1759,13 +1791,13 @@ function counterStyleCss(model, sources, pageMap, pageCount, resetSites = [], ha
     for (const pseudos of variants) {
       const resolved = resolvePage(model, { name, pseudos });
       const lines = [];
-      for (const [box, decls] of Object.entries(resolved.marginBoxes)) {
-        if (!decls.content)
+      for (const [box, decls2] of Object.entries(resolved.marginBoxes)) {
+        if (!decls2.content)
           continue;
-        const hasString = /\bstring\s*\(/.test(decls.content);
-        const hasPageCounter = pageValues && /\bcounter\(\s*page\b(?!s)/.test(decls.content);
+        const hasString = /\bstring\s*\(/.test(decls2.content);
+        const hasPageCounter = pageValues && /\bcounter\(\s*page\b(?!s)/.test(decls2.content);
         const needsRewrite = hasString || hasPageCounter;
-        lines.push(`  ${box} { content: ${needsRewrite ? rewrite(decls.content) : decls.content}; }`);
+        lines.push(`  ${box} { content: ${needsRewrite ? rewrite(decls2.content) : decls2.content}; }`);
       }
       if (!lines.length)
         continue;
@@ -1779,13 +1811,13 @@ ${lines.join(`
   if (hasBlank) {
     const blank = resolvePage(model, { pseudos: ["blank"] });
     const lines = [];
-    for (const [box, decls] of Object.entries(blank.marginBoxes)) {
-      if (!decls.content)
+    for (const [box, decls2] of Object.entries(blank.marginBoxes)) {
+      if (!decls2.content)
         continue;
-      const hasString = /\bstring\s*\(/.test(decls.content);
-      const hasPageCounter = pageValues && /\bcounter\(\s*page\b(?!s)/.test(decls.content);
+      const hasString = /\bstring\s*\(/.test(decls2.content);
+      const hasPageCounter = pageValues && /\bcounter\(\s*page\b(?!s)/.test(decls2.content);
       const needsRewrite = hasString || hasPageCounter;
-      lines.push(`  ${box} { content: ${needsRewrite ? rewrite(decls.content) : decls.content}; }`);
+      lines.push(`  ${box} { content: ${needsRewrite ? rewrite(decls2.content) : decls2.content}; }`);
     }
     out.push(`@page ${BLANK_PAGE} {
 ${lines.length ? lines.join(`

package/dist/{index-hphcn7th.js → index-rj5vrhz6.js}

@@ -14,11 +14,12 @@ import {
   readExtensionMeta,
   resolveExtension,
   slugify
-} from "./index-fp7xwvpr.js";
+} from "./index-a4j3xcfp.js";
 import {
   BuildError,
-  EXIT_CODES
-} from "./index-46ycxe6r.js";
+  EXIT_CODES,
+  isNonNegativePoints
+} from "./index-tayzfr9c.js";
 import {
   EXTENSIONS_DIR,
   VENDORED_NPM_DIR,
@@ -91,87 +92,6 @@ import { existsSync, statSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { parse as parseYaml, YAMLParseError } from "yaml";
 
-// src/engine/shared/print-area.ts
-function isPositivePoints(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0;
-}
-function isNonNegativePoints(value) {
-  return typeof value === "number" && Number.isFinite(value) && value >= 0;
-}
-var round3 = (n) => Math.round(n * 1000) / 1000;
-function cssLength(pt) {
-  const inches = round3(pt / 72);
-  return Math.abs(inches * 72 - pt) < 0.000001 ? `${inches}in` : `${round3(pt)}pt`;
-}
-function formatPageSize(page) {
-  return `${cssLength(page.width)} ${cssLength(page.height)}`;
-}
-function printAreaMeta(page) {
-  const area = JSON.stringify({
-    width: page.width,
-    height: page.height,
-    bleed: page.bleed ?? 0,
-    safe: page.safe ?? 0,
-    artSafe: page.artSafe,
-    gutter: page.gutter,
-    preset: page.preset,
-    spec: page.spec
-  });
-  return `<meta name="gp-print-area" content='${area.replace(/&/g, "&amp;").replace(/'/g, "&#39;")}'>`;
-}
-function pageBoxes(area, side, scale = 1) {
-  const w = area.width * scale;
-  const h = area.height * scale;
-  const b = Math.max(0, area.bleed) * scale;
-  const s = Math.max(0, area.safe) * scale;
-  const a = Math.max(0, area.artSafe) * scale;
-  const g = Math.max(0, area.gutter) * scale;
-  const [textLeft, textRight] = side === "verso" ? [s, g] : [g, s];
-  const [artLeft, artRight] = side === "verso" ? [a, g] : [g, a];
-  const trim = { x: side === "verso" ? b : 0, y: b, w: Math.max(0, w - b), h: Math.max(0, h - 2 * b) };
-  return {
-    sheet: { x: 0, y: 0, w, h },
-    trim,
-    safe: {
-      x: trim.x + textLeft,
-      y: trim.y + s,
-      w: Math.max(0, trim.w - textLeft - textRight),
-      h: Math.max(0, trim.h - 2 * s)
-    },
-    safeArt: {
-      x: trim.x + artLeft,
-      y: trim.y + a,
-      w: Math.max(0, trim.w - artLeft - artRight),
-      h: Math.max(0, trim.h - 2 * a)
-    },
-    bleed: b
-  };
-}
-var SEVERITY = { inside: 0, unsafe: 1, bleed: 2, "off-page": 3 };
-function judgeRect(r, boxes, rule, tol = 0) {
-  const { sheet, trim } = boxes;
-  const safe = rule === "art" ? boxes.safeArt : boxes.safe;
-  const sides = [
-    ["left", -r.x, -safe.x, -trim.x, -sheet.x],
-    ["right", r.x + r.w, safe.x + safe.w, trim.x + trim.w, sheet.x + sheet.w],
-    ["top", -r.y, -safe.y, -trim.y, -sheet.y],
-    ["bottom", r.y + r.h, safe.y + safe.h, trim.y + trim.h, sheet.y + sheet.h]
-  ];
-  let worst = { kind: "inside", gap: 0, need: 0, edge: null };
-  let beyond = 0;
-  for (const [edge, ink, limit, trimEdge, sheetEdge] of sides) {
-    const past = ink - limit;
-    if (past <= tol || rule === "art" && ink >= sheetEdge - tol)
-      continue;
-    const kind = ink > sheetEdge + tol ? "off-page" : ink > trimEdge + tol ? "bleed" : "unsafe";
-    if (SEVERITY[kind] > SEVERITY[worst.kind] || kind === worst.kind && past > beyond) {
-      worst = { kind, gap: trimEdge - ink, need: trimEdge - limit, edge };
-      beyond = past;
-    }
-  }
-  return worst;
-}
-
 // src/constants.ts
 var NETWORK = {
   DEFAULT_PORT: 3579
@@ -2318,4 +2238,4 @@ async function restoreForCommand(dir, options) {
     log.warn(problem);
 }
 
-export { isPositivePoints, isNonNegativePoints, round3, cssLength, formatPageSize, printAreaMeta, pageBoxes, judgeRect, DEBOUNCE, UsageError, resolvePort, PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, resolveTargets, applyDefaultPdfStrictChecks, MANIFEST_FILENAMES, hasProjectManifest, loadManifest, loadManifestWithPath, resolveConfig, resolveConfigForTarget, MARGIN_EDGES, validatePageMargin, FriendlyHttpError, withFetchTimeout, loadManifestDoc, writeManifestDoc, scalarString, DEFAULT_NPM_REGISTRY, npmRegistryUrl, ensureProjectGitignore, sameExtension, listProjectExtensions, describeExtension, extensionConfigFor, setExtensionEnabled, reorderExtensions, removeExtension, addExtension, listNpmVersions, checkExtensionUpdates, updateExtensions, listBundledExtensions, uniqueExtensionId, validateProjectExtensions, readExtensionCss, readEntryCss, restorePinnedExtensions, restoreFailureMessage, restoreOfflineMessage, restoreForCommand };
+export { DEBOUNCE, UsageError, resolvePort, PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, resolveTargets, applyDefaultPdfStrictChecks, MANIFEST_FILENAMES, hasProjectManifest, loadManifest, loadManifestWithPath, resolveConfig, resolveConfigForTarget, MARGIN_EDGES, validatePageMargin, FriendlyHttpError, withFetchTimeout, loadManifestDoc, writeManifestDoc, scalarString, DEFAULT_NPM_REGISTRY, npmRegistryUrl, ensureProjectGitignore, sameExtension, listProjectExtensions, describeExtension, extensionConfigFor, setExtensionEnabled, reorderExtensions, removeExtension, addExtension, listNpmVersions, checkExtensionUpdates, updateExtensions, listBundledExtensions, uniqueExtensionId, validateProjectExtensions, readExtensionCss, readEntryCss, restorePinnedExtensions, restoreFailureMessage, restoreOfflineMessage, restoreForCommand };

package/dist/index-tayzfr9c.js

@@ -0,0 +1,99 @@
+// src/lib/build-error.ts
+var EXIT_CODES = {
+  OK: 0,
+  FINDINGS: 1,
+  USAGE: 2,
+  PIPELINE: 3
+};
+
+class BuildError extends Error {
+  exitCode;
+  constructor(message, exitCode = EXIT_CODES.PIPELINE, options) {
+    super(message, options);
+    this.name = "BuildError";
+    this.exitCode = exitCode;
+  }
+}
+
+// src/engine/shared/print-area.ts
+function isPositivePoints(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0;
+}
+function isNonNegativePoints(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+var round3 = (n) => Math.round(n * 1000) / 1000;
+function cssLength(pt) {
+  const inches = round3(pt / 72);
+  return Math.abs(inches * 72 - pt) < 0.000001 ? `${inches}in` : `${round3(pt)}pt`;
+}
+function formatPageSize(page) {
+  return `${cssLength(page.width)} ${cssLength(page.height)}`;
+}
+function printAreaMeta(page) {
+  const area = JSON.stringify({
+    width: page.width,
+    height: page.height,
+    bleed: page.bleed ?? 0,
+    safe: page.safe ?? 0,
+    artSafe: page.artSafe,
+    gutter: page.gutter,
+    preset: page.preset,
+    spec: page.spec
+  });
+  return `<meta name="gp-print-area" content='${area.replace(/&/g, "&amp;").replace(/'/g, "&#39;")}'>`;
+}
+function pageBoxes(area, side, scale = 1) {
+  const w = area.width * scale;
+  const h = area.height * scale;
+  const b = Math.max(0, area.bleed) * scale;
+  const s = Math.max(0, area.safe) * scale;
+  const a = Math.max(0, area.artSafe) * scale;
+  const g = Math.max(0, area.gutter) * scale;
+  const [textLeft, textRight] = side === "verso" ? [s, g] : [g, s];
+  const [artLeft, artRight] = side === "verso" ? [a, g] : [g, a];
+  const trim = { x: side === "verso" ? b : 0, y: b, w: Math.max(0, w - b), h: Math.max(0, h - 2 * b) };
+  return {
+    sheet: { x: 0, y: 0, w, h },
+    trim,
+    safe: {
+      x: trim.x + textLeft,
+      y: trim.y + s,
+      w: Math.max(0, trim.w - textLeft - textRight),
+      h: Math.max(0, trim.h - 2 * s)
+    },
+    safeArt: {
+      x: trim.x + artLeft,
+      y: trim.y + a,
+      w: Math.max(0, trim.w - artLeft - artRight),
+      h: Math.max(0, trim.h - 2 * a)
+    },
+    bleed: b
+  };
+}
+var SEVERITY = { inside: 0, unsafe: 1, bleed: 2, "off-page": 3 };
+function judgeRect(r, boxes, rule, tol = 0) {
+  const { sheet, trim } = boxes;
+  const safe = rule === "art" ? boxes.safeArt : boxes.safe;
+  const sides = [
+    ["left", -r.x, -safe.x, -trim.x, -sheet.x],
+    ["right", r.x + r.w, safe.x + safe.w, trim.x + trim.w, sheet.x + sheet.w],
+    ["top", -r.y, -safe.y, -trim.y, -sheet.y],
+    ["bottom", r.y + r.h, safe.y + safe.h, trim.y + trim.h, sheet.y + sheet.h]
+  ];
+  let worst = { kind: "inside", gap: 0, need: 0, edge: null };
+  let beyond = 0;
+  for (const [edge, ink, limit, trimEdge, sheetEdge] of sides) {
+    const past = ink - limit;
+    if (past <= tol || rule === "art" && ink >= sheetEdge - tol)
+      continue;
+    const kind = ink > sheetEdge + tol ? "off-page" : ink > trimEdge + tol ? "bleed" : "unsafe";
+    if (SEVERITY[kind] > SEVERITY[worst.kind] || kind === worst.kind && past > beyond) {
+      worst = { kind, gap: trimEdge - ink, need: trimEdge - limit, edge };
+      beyond = past;
+    }
+  }
+  return worst;
+}
+
+export { isPositivePoints, isNonNegativePoints, round3, cssLength, formatPageSize, printAreaMeta, pageBoxes, judgeRect, EXIT_CODES, BuildError };

package/dist/index.d.ts

@@ -26,6 +26,8 @@ export type { PlatformAdapter, FileStat, FileWriteResult } from "./platform.ts";
 export { inspectImage } from "./lib/image-inspect.ts";
 export type { ImageInfo, ColorSpace } from "./lib/image-inspect.ts";
 export { checkCss } from "./lib/printsafe.ts";
+export { readBookCss, bookTokenEdits } from "./lib/book-css.ts";
+export type { BookCss, BookCssChunk, CssChunk, CssChunkOrigin, RootToken, StylesheetEdit, TokenUpdate, } from "./lib/book-css.ts";
 export { BUILD_DIAGNOSTIC_CODES } from "./engine/compiler/build.ts";
 export type { BuildDiagnostic, BuildDiagnosticCode } from "./engine/compiler/build.ts";
 export type { PrintSafeWarning } from "./lib/printsafe.ts";