gutterpress 0.11.23-alpha.1 → 0.11.23-alpha.3

package/dist/{cli-dd115fa8.js → cli-h4x81x97.js}

@@ -1,28 +1,29 @@
 import {
   EXTENSION_MANIFEST_FILENAME,
   TWO_VERSIONS_OPEN,
+  bundledExtension,
   extensionCarries,
   extensionStyleList,
+  isPathSpecifier,
   loadPlugin,
+  parseExtensionSpecifier,
+  pinnedNpmSpecifier,
   prettify,
   readExtensionMeta,
   slugify
-} from "./cli-h17e3mtz.js";
+} from "./cli-t8be9yeb.js";
 import {
   log
-} from "./cli-b0vyjvmt.js";
+} from "./cli-s6djx4ma.js";
 import {
   UsageError
 } from "./cli-d8xjns66.js";
-import {
-  getAssetsDir
-} from "./cli-fe43evmf.js";
 import {
   BuildError,
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
 import {
-  PLUGINS_DIR,
+  EXTENSIONS_DIR,
   VENDORED_NPM_DIR,
   assertWindowsSafeRelativePath,
   isExactNpmVersion,
@@ -31,8 +32,9 @@ import {
   resolveVendoredPluginInstallRoot,
   vendoredNpmPluginPackageDir,
   vendoredNpmPluginRoot,
+  vendoredNpmPluginRoots,
   windowsPathKey
-} from "./cli-h3phdstf.js";
+} from "./cli-y28j019d.js";
 import {
   __require
 } from "./cli-37x76zdn.js";
@@ -74,7 +76,7 @@ async function withFetchTimeout(options, run) {
 }
 
 // src/lib/extension-manager.ts
-import { cp, mkdir as mkdir3, readdir, readFile as readFile5, rm as rm3, stat } from "node:fs/promises";
+import { readdir, readFile as readFile5, rm as rm3, stat } from "node:fs/promises";
 import { existsSync as existsSync3 } from "node:fs";
 import path4 from "node:path";
 import { isSeq as isSeq2, isMap, isScalar, YAMLMap, Scalar } from "yaml";
@@ -92,42 +94,85 @@ import { existsSync, statSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { parse as parseYaml, YAMLParseError } from "yaml";
 
-// src/lib/extension-specifier.ts
-var BUNDLED_EXTENSIONS = [
-  "markdown-it-mark",
-  "markdown-it-sub",
-  "markdown-it-sup",
-  "markdown-it-abbr",
-  "gutterpress-gfm-alerts",
-  "gutterpress-math"
-];
-function isBundledExtension(name) {
-  return BUNDLED_EXTENSIONS.includes(name);
-}
-function isPathSpecifier(use) {
-  return use.startsWith("./") || use.startsWith("../") || use.startsWith("/") || /^[a-zA-Z]:[\\/]/.test(use);
-}
-function parseExtensionSpecifier(use) {
-  const spec = use.trim();
-  if (!spec) {
-    throw new Error("An extension specifier is required — an npm package name, or a ./ path.");
-  }
-  if (isPathSpecifier(spec))
-    return { kind: "path", path: spec };
-  if (/\.(m?js|cjs)$/i.test(spec) || !spec.startsWith("@") && spec.includes("/")) {
-    throw new Error(`"${spec}" looks like a path; write it as "./${spec}". A specifier that does not ` + "start with ./, ../ or / is an npm package name.");
-  }
-  const parsed = parseNpmPluginSpec(spec);
-  if (isBundledExtension(parsed.name)) {
-    if (parsed.selector !== undefined) {
-      throw new Error(`"${parsed.name}" is bundled with Gutterpress and always resolves to the bundled copy — ` + `drop "@${parsed.selector}".`);
+// 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 { kind: "bundled", name: parsed.name };
   }
-  return parsed.selector === undefined ? { kind: "npm", name: parsed.name } : { kind: "npm", name: parsed.name, version: parsed.selector };
-}
-function pinnedNpmSpecifier(name, version) {
-  return `${name}@${version}`;
+  return worst;
 }
 
 // src/lib/presets.ts
@@ -160,7 +205,8 @@ var DTRPG_PRESET = {
     bleed: 9,
     safe: 36,
     artSafe: 18,
-    gutter: 36
+    gutter: 36,
+    margin: undefined
   },
   ink: {
     maxTac: 240,
@@ -246,7 +292,8 @@ var BOOK_PRESET = {
     bleed: undefined,
     safe: 18,
     artSafe: undefined,
-    gutter: undefined
+    gutter: undefined,
+    margin: undefined
   },
   ink: {
     maxTac: 400,
@@ -608,9 +655,28 @@ function resolveCustomPage(c, m) {
     bleed: c.page?.bleed ?? m.page?.bleed,
     safe: c.page?.safe ?? m.page?.safe,
     artSafe: c.page?.artSafe ?? m.page?.artSafe,
-    gutter: c.page?.gutter ?? m.page?.gutter
+    gutter: c.page?.gutter ?? m.page?.gutter,
+    margin: c.page?.margin ?? m.page?.margin
   };
 }
+var MARGIN_EDGES = ["top", "bottom", "inside", "outside"];
+function validatePageMargin(margin, size) {
+  const edges = isPlainObject(margin) && Object.keys(margin).every((k) => MARGIN_EDGES.includes(k)) && MARGIN_EDGES.every((e) => isNonNegativePoints(margin[e]));
+  if (!edges) {
+    throw new UsageError("Manifest field `page.margin` must set all four edges in points (72pt = 1in), for example\n" + `  page:
+    margin:
+      top: 54
+      bottom: 54
+      inside: 54
+      outside: 54
+` + `got ${JSON.stringify(margin)}.`);
+  }
+  const m = margin;
+  if (m.inside + m.outside >= size.width || m.top + m.bottom >= size.height) {
+    throw new UsageError(`Manifest field \`page.margin\` leaves no room for text on a ${size.width} x ${size.height}pt page ` + `(inside ${m.inside} + outside ${m.outside} across, top ${m.top} + bottom ${m.bottom} down).`);
+  }
+  return m;
+}
 function resolveWithPreset(cliOverrides, manifest, preset) {
   const m = manifest;
   const c = cliOverrides;
@@ -663,6 +729,9 @@ function resolveWithPreset(cliOverrides, manifest, preset) {
     throw new UsageError("Manifest field `extensions` must be a list of specifiers.");
   }
   const extensions = rawExtensions.map((entry, index) => ({ entry, index })).filter(({ entry }) => typeof entry === "string" || entry?.enabled !== false).map(({ entry, index }) => normalizeExtensionEntry(entry, index));
+  const page = preset.page ? mergeShape(c.page, m.page, preset.page) : resolveCustomPage(c, m);
+  if (page.margin !== undefined && page.margin !== null)
+    validatePageMargin(page.margin, page);
   return {
     title: c.title ?? m.title ?? "Document",
     authors: c.authors ?? m.authors ?? [],
@@ -675,7 +744,7 @@ function resolveWithPreset(cliOverrides, manifest, preset) {
     source: mergeShape(c.source, m.source, preset.source),
     pdfx: mergeShape(c.pdfx, m.pdfx, preset.pdfx),
     print: mergeShape(c.print, m.print, preset.print),
-    page: preset.page ? mergeShape(c.page, m.page, preset.page) : resolveCustomPage(c, m),
+    page,
     ink: mergeShape(c.ink, m.ink, preset.ink),
     lint: {
       ...mergeShape(c.lint, m.lint, preset.lint),
@@ -1283,13 +1352,13 @@ async function removeEmptyDirs(dirs) {
   }
 }
 async function prepareVendorParent(projectDir, name) {
-  const plugins = path2.join(projectDir, PLUGINS_DIR);
-  const npm = path2.join(plugins, VENDORED_NPM_DIR);
+  const extensions = path2.join(projectDir, EXTENSIONS_DIR);
+  const npm = path2.join(extensions, VENDORED_NPM_DIR);
   const packageParent = path2.dirname(vendoredNpmPluginRoot(projectDir, name, "0.0.0"));
   await mkdir2(projectDir, { recursive: true });
   const createdDirs = [];
   try {
-    for (const dir of [plugins, npm, packageParent]) {
+    for (const dir of [extensions, npm, packageParent]) {
       if (await ensureDirectory(dir))
         createdDirs.push(dir);
     }
@@ -1408,7 +1477,7 @@ function ignoreStatus(gitignore, entry) {
     return "ignored";
   return dir.unignored || file.unignored ? "negated" : "open";
 }
-var PROJECT_GITIGNORE_ENTRIES = ["dist/", "plugins/npm/"];
+var PROJECT_GITIGNORE_ENTRIES = ["dist/", "extensions/npm/"];
 async function ensureProjectGitignore(projectDir) {
   const gitignorePath = path3.join(projectDir, ".gitignore");
   let existing = null;
@@ -1436,40 +1505,6 @@ async function ensureProjectGitignore(projectDir) {
 }
 
 // src/lib/extension-manager.ts
-var EXTENSIONS_DIR = "extensions";
-var RECOMMENDED_EXTENSIONS = [
-  {
-    use: "markdown-it-mark",
-    label: "Highlight",
-    description: "Highlight text by wrapping it in `==double equals==`."
-  },
-  {
-    use: "markdown-it-sub",
-    label: "Subscript",
-    description: "Lower text below the line, like the 2 in `H~2~O`."
-  },
-  {
-    use: "markdown-it-sup",
-    label: "Superscript",
-    description: "Raise text above the line, like the th in `29^th^`."
-  },
-  {
-    use: "markdown-it-abbr",
-    label: "Abbreviations",
-    description: "Explain an abbreviation when readers hover over it. Define it once, like `*[GPS]: Global Positioning System`."
-  },
-  {
-    use: "gutterpress-gfm-alerts",
-    label: "Callouts",
-    description: "Turn a quote into a boxed note: start it with `> [!NOTE]` (or `TIP`, `IMPORTANT`, `WARNING`, `CAUTION`)."
-  },
-  {
-    use: "gutterpress-math",
-    label: "Math",
-    description: "Write LaTeX math between dollar signs: `$E = mc^2$` in a line, or `$$` … `$$` on lines of their own."
-  }
-];
-var BUILT_IN_STYLE_SET_IDS = ["clean-book", "zine", "technical-doc", "academic"];
 var mutationQueues = new Map;
 function projectKey(projectDir) {
   const resolved = path4.resolve(projectDir);
@@ -1561,7 +1596,6 @@ async function describeFolder(dir, base, fallbackLabel, labelFrom = prettify) {
     ...meta.description?.trim() ? { description: meta.description.trim() } : {},
     ...meta.author?.trim() ? { author: meta.author.trim() } : {},
     ...meta.preview !== undefined ? { preview: meta.preview } : {},
-    ...meta.tokensFile?.trim() ? { tokensFile: meta.tokensFile.trim() } : {},
     ...styles.length > 0 ? { styles } : {},
     carries: extensionCarries(meta),
     dir
@@ -1585,15 +1619,14 @@ async function describeEntry(projectDir, raw) {
     return withWarnings({ ...common, kind: "npm", name: raw.use, label: raw.use, carries: NO_CARRIES });
   }
   if (parsed.kind === "bundled") {
-    const bundledName = parsed.name;
-    const rec = RECOMMENDED_EXTENSIONS.find((r) => r.use === bundledName);
+    const bundled = bundledExtension(parsed.name);
     return withWarnings({
       ...common,
       kind: "bundled",
-      name: bundledName,
-      label: rec?.label ?? bundledName,
-      ...rec ? { description: rec.description } : {},
-      carries: { ...NO_CARRIES, markdown: true }
+      name: parsed.name,
+      label: bundled.label,
+      description: bundled.description,
+      carries: { ...NO_CARRIES, ...bundled.css !== undefined ? { styles: true } : { markdown: true } }
     });
   }
   if (parsed.kind === "path") {
@@ -1715,9 +1748,10 @@ async function removeExtension(projectDir, use) {
       return;
     }
     if (parsed.kind === "npm" && parsed.version) {
-      const root = vendoredNpmPluginRoot(projectDir, parsed.name, parsed.version);
-      await rm3(root, { recursive: true, force: true });
-      await removeEmptyDirs([path4.dirname(root)]);
+      for (const root of vendoredNpmPluginRoots(projectDir, parsed.name, parsed.version)) {
+        await rm3(root, { recursive: true, force: true });
+        await removeEmptyDirs([path4.dirname(root)]);
+      }
     }
   });
 }
@@ -1835,8 +1869,8 @@ async function vendorNpmExtension(projectDir, input, exportName, options, commit
   });
   try {
     const { negated } = await ensureProjectGitignore(projectDir);
-    if (negated.includes("plugins/npm/")) {
-      warnings.push("Your .gitignore re-includes plugins/npm/, so downloaded extensions will be committed with " + "your book. They shouldn't be: the manifest pins each version and a build downloads a " + "missing copy again.");
+    if (negated.includes("extensions/npm/")) {
+      warnings.push("Your .gitignore re-includes extensions/npm/, so downloaded extensions will be committed with " + "your book. They shouldn't be: the manifest pins each version and a build downloads a " + "missing copy again.");
     }
   } catch (error) {
     warnings.push(`The extension was installed, but .gitignore could not be updated to keep it out of version history: ` + `${error instanceof Error ? error.message : String(error)}`);
@@ -1862,24 +1896,32 @@ async function pinnedVersionsOf(projectDir, name) {
   return versions;
 }
 async function pruneStaleVersions(projectDir, name, keep) {
-  const parent = path4.dirname(vendoredNpmPluginRoot(projectDir, name, "0.0.0"));
+  const parents = vendoredNpmPluginRoots(projectDir, name, "0.0.0").map((root) => path4.dirname(root));
   try {
-    for (const entry of await readdir(parent, { withFileTypes: true })) {
-      if (!entry.isDirectory())
-        continue;
-      let version;
+    for (const parent of parents) {
+      let entries;
       try {
-        version = decodeURIComponent(entry.name);
-      } catch {
-        continue;
+        entries = await readdir(parent, { withFileTypes: true });
+      } catch (error) {
+        if (error.code === "ENOENT")
+          continue;
+        throw error;
+      }
+      for (const entry of entries) {
+        if (!entry.isDirectory())
+          continue;
+        let version;
+        try {
+          version = decodeURIComponent(entry.name);
+        } catch {
+          continue;
+        }
+        if (!isExactNpmVersion(version) || keep.includes(version))
+          continue;
+        await rm3(path4.join(parent, entry.name), { recursive: true, force: true });
       }
-      if (!isExactNpmVersion(version) || keep.includes(version))
-        continue;
-      await rm3(path4.join(parent, entry.name), { recursive: true, force: true });
     }
   } catch (error) {
-    if (error.code === "ENOENT")
-      return [];
     return [
       `The extension was installed, but a previous version's downloaded copy could not be removed: ` + `${error instanceof Error ? error.message : String(error)}`
     ];
@@ -1970,20 +2012,6 @@ async function uniqueExtensionId(projectDir, base) {
   }
   return candidate;
 }
-async function addBuiltInStyleSet(projectDir, id) {
-  if (!BUILT_IN_STYLE_SET_IDS.includes(id)) {
-    throw new Error(`Unknown built-in look "${id}" (one of: ${BUILT_IN_STYLE_SET_IDS.join(", ")}).`);
-  }
-  return withMutationLock(projectDir, async () => {
-    const dest = path4.join(projectDir, EXTENSIONS_DIR, id);
-    if (!existsSync3(dest)) {
-      const src = path4.join(await getAssetsDir(), "themes", id);
-      await mkdir3(path4.dirname(dest), { recursive: true });
-      await cp(src, dest, { recursive: true });
-    }
-    return addExtensionUnlocked(projectDir, `./${EXTENSIONS_DIR}/${id}`, {});
-  });
-}
 
 // src/lib/extension-restore.ts
 var OFFLINE_REASON = "you appear to be offline (npm can't be reached)";
@@ -2102,4 +2130,4 @@ async function restoreForCommand(dir, options) {
     log.warn(problem);
 }
 
-export { isPathSpecifier, parseExtensionSpecifier, PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, resolveTargets, applyDefaultPdfStrictChecks, MANIFEST_FILENAMES, loadManifest, loadManifestWithPath, resolveConfig, resolveConfigForTarget, FriendlyHttpError, withFetchTimeout, loadManifestDoc, writeManifestDoc, npmRegistryUrl, ensureProjectGitignore, EXTENSIONS_DIR, BUILT_IN_STYLE_SET_IDS, listProjectExtensions, setExtensionEnabled, removeExtension, addExtension, checkExtensionUpdates, updateExtensions, uniqueExtensionId, addBuiltInStyleSet, restorePinnedExtensions, restoreFailureMessage, restoreOfflineMessage, restoreForCommand };
+export { isPositivePoints, cssLength, formatPageSize, printAreaMeta, pageBoxes, judgeRect, PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, resolveTargets, applyDefaultPdfStrictChecks, MANIFEST_FILENAMES, loadManifest, loadManifestWithPath, resolveConfig, resolveConfigForTarget, FriendlyHttpError, withFetchTimeout, loadManifestDoc, writeManifestDoc, npmRegistryUrl, ensureProjectGitignore, listProjectExtensions, setExtensionEnabled, removeExtension, addExtension, checkExtensionUpdates, updateExtensions, uniqueExtensionId, restorePinnedExtensions, restoreFailureMessage, restoreOfflineMessage, restoreForCommand };

package/dist/{cli-ccp7sxz3.js → cli-n2tsxqpn.js}

@@ -11,7 +11,7 @@ import {
 import {
   PACKAGE_VERSION,
   log
-} from "./cli-b0vyjvmt.js";
+} from "./cli-s6djx4ma.js";
 import {
   __require
 } from "./cli-37x76zdn.js";

package/dist/{cli-b0vyjvmt.js → cli-s6djx4ma.js}

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./cli-nr6j6300.js";
+} from "./cli-5jzyw06s.js";
 
 // src/utils/logger.ts
 var currentLevel = "INFO";