gutterpress 0.11.23-alpha.5 → 0.11.23-alpha.6

package/dist/cli.js

@@ -8,7 +8,7 @@ import {
 } from "./cli-d8xjns66.js";
 import {
   package_default
-} from "./cli-yxfznmsq.js";
+} from "./cli-qzkq9em8.js";
 import {
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
@@ -20,14 +20,14 @@ import {
 import { defineCommand, parseArgs, runMain } from "citty";
 import { statSync } from "node:fs";
 var SUBCOMMANDS = {
-  new: () => import("./new-5a4w2vkh.js").then((m) => m.default),
-  preview: () => import("./preview-kmx4h7gv.js").then((m) => m.default),
-  build: () => import("./build-4qv9wvrx.js").then((m) => m.default),
-  publish: () => import("./publish-62843020.js").then((m) => m.default),
-  validate: () => import("./validate-vvmrd85g.js").then((m) => m.default),
-  preflight: () => import("./preflight-jma71n0j.js").then((m) => m.default),
-  doctor: () => import("./doctor-5nh3t346.js").then((m) => m.default),
-  ext: () => import("./ext-nhcep6h6.js").then((m) => m.default)
+  new: () => import("./new-b27kyr02.js").then((m) => m.default),
+  preview: () => import("./preview-bck9f88w.js").then((m) => m.default),
+  build: () => import("./build-py643c5a.js").then((m) => m.default),
+  publish: () => import("./publish-keyp8rh4.js").then((m) => m.default),
+  validate: () => import("./validate-z28cvr5x.js").then((m) => m.default),
+  preflight: () => import("./preflight-akdqz9v8.js").then((m) => m.default),
+  doctor: () => import("./doctor-tyrzqphh.js").then((m) => m.default),
+  ext: () => import("./ext-70kt3eft.js").then((m) => m.default)
 };
 var VERSION = package_default.version;
 var main = defineCommand({
@@ -52,7 +52,7 @@ async function preflightRequiredInvocations(rawArgs) {
   const [command, ...commandArgs] = rawArgs;
   try {
     if (command === "new") {
-      const { newArgs } = await import("./new-5a4w2vkh.js");
+      const { newArgs } = await import("./new-b27kyr02.js");
       rejectUnknownFlags(commandArgs, newArgs, "new");
       const parsed = parseArgs(commandArgs, {
         ...newArgs,
@@ -64,7 +64,7 @@ async function preflightRequiredInvocations(rawArgs) {
       return;
     }
     if (command === "preflight") {
-      const { preflightArgs } = await import("./preflight-jma71n0j.js");
+      const { preflightArgs } = await import("./preflight-akdqz9v8.js");
       rejectUnknownFlags(commandArgs, preflightArgs, "preflight");
       const parsed = parseArgs(commandArgs, {
         ...preflightArgs,
@@ -84,7 +84,7 @@ async function preflightRequiredInvocations(rawArgs) {
       }
       if (subcommand.startsWith("-"))
         return;
-      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-nhcep6h6.js");
+      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-70kt3eft.js");
       if (!EXT_SUBCOMMANDS.includes(subcommand)) {
         throw new UsageError(`gutterpress ext: unknown command "${subcommand}"`);
       }

package/dist/{doctor-5nh3t346.js → doctor-tyrzqphh.js}

@@ -1,17 +1,17 @@
 import {
   getSystemDiagnostics
-} from "./cli-nk0efg2x.js";
+} from "./cli-bnf7eb38.js";
 import"./cli-5crpmz42.js";
 import"./cli-asap4t1z.js";
 import {
   log
-} from "./cli-2t3krcfy.js";
+} from "./cli-tf9tw6at.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
 } from "./cli-d8xjns66.js";
-import"./cli-yxfznmsq.js";
+import"./cli-qzkq9em8.js";
 import"./cli-46ycxe6r.js";
 import"./cli-37x76zdn.js";
 

package/dist/{ext-nhcep6h6.js → ext-70kt3eft.js}

@@ -2,14 +2,14 @@ import {
   importExtensionFromFile,
   importExtensionFromUrl,
   searchNpmExtensions
-} from "./cli-pth362d8.js";
-import"./cli-nk0efg2x.js";
+} from "./cli-09jj8w5g.js";
+import"./cli-bnf7eb38.js";
 import"./cli-ht1bcqdd.js";
 import"./cli-58fsk6d7.js";
 import"./cli-5crpmz42.js";
 import"./cli-eyyggect.js";
 import"./cli-asap4t1z.js";
-import"./cli-a35w7wzg.js";
+import"./cli-31anr0r9.js";
 import"./cli-v5mp7a6q.js";
 import {
   addExtension,
@@ -18,12 +18,12 @@ import {
   removeExtension,
   setExtensionEnabled,
   updateExtensions
-} from "./cli-w97xcpag.js";
+} from "./cli-55br530w.js";
 import {
   isPathSpecifier,
   parseExtensionSpecifier
-} from "./cli-de8ydmm7.js";
-import"./cli-2t3krcfy.js";
+} from "./cli-x777v272.js";
+import"./cli-tf9tw6at.js";
 import {
   UsageError,
   exitForUsage,
@@ -31,7 +31,7 @@ import {
   rejectUnknownFlags,
   resolveProjectDir
 } from "./cli-d8xjns66.js";
-import"./cli-yxfznmsq.js";
+import"./cli-qzkq9em8.js";
 import {
   EXIT_CODES
 } from "./cli-46ycxe6r.js";

package/dist/{extension-restore-x3mtn844.js → extension-restore-fjfn1hrk.js}

@@ -3,11 +3,11 @@ import {
   restoreForCommand,
   restoreOfflineMessage,
   restorePinnedExtensions
-} from "./cli-w97xcpag.js";
-import"./cli-de8ydmm7.js";
-import"./cli-2t3krcfy.js";
+} from "./cli-55br530w.js";
+import"./cli-x777v272.js";
+import"./cli-tf9tw6at.js";
 import"./cli-d8xjns66.js";
-import"./cli-yxfznmsq.js";
+import"./cli-qzkq9em8.js";
 import"./cli-46ycxe6r.js";
 import"./cli-y28j019d.js";
 import"./cli-37x76zdn.js";

package/dist/{extension-restore-55kp0ksq.js → extension-restore-whag4sm0.js}

@@ -3,8 +3,8 @@ import {
   restoreForCommand,
   restoreOfflineMessage,
   restorePinnedExtensions
-} from "./index-t3jkavdz.js";
-import"./index-9ye22m7r.js";
+} from "./index-cmakyf43.js";
+import"./index-1zqkfzcd.js";
 import"./index-46ycxe6r.js";
 import"./index-5x42amh8.js";
 import"./index-37x76zdn.js";

package/dist/{index-9ye22m7r.js → index-1zqkfzcd.js}

@@ -398,7 +398,7 @@ import { satisfies, validRange } from "semver";
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.23-alpha.5",
+  version: "0.11.23-alpha.6",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",
@@ -2863,8 +2863,8 @@ function twoVersions(state, startLine, endLine, silent) {
   open.attrSet("class", "gp-two-versions");
   open.map = [startLine, closer + 1];
   open.block = true;
-  pushVersion(state, "yours", "Your version", startLine + 1, separator);
-  pushVersion(state, "online", "Online version", separator + 1, closer);
+  pushVersion(state, "yours", "Your take", startLine + 1, separator);
+  pushVersion(state, "online", "Online take", separator + 1, closer);
   const close = state.push("two_versions_close", "div", -1);
   close.block = true;
   state.parentType = oldParent;

package/dist/{index-t3jkavdz.js → index-cmakyf43.js}

@@ -14,7 +14,7 @@ import {
   readExtensionMeta,
   resolveExtension,
   slugify
-} from "./index-9ye22m7r.js";
+} from "./index-1zqkfzcd.js";
 import {
   BuildError,
   EXIT_CODES
@@ -599,7 +599,7 @@ async function loadManifestWithPath(pathOrDir, opts) {
     if (existsSync(p) && statSync(p).isFile()) {
       const raw = await readFile(p, "utf8");
       if (raw.split(/\r?\n/).includes(TWO_VERSIONS_OPEN)) {
-        throw new UsageError(`"${p}" has two versions of a setting — yours and the online version — left by a sync. Open it, keep the one you want and delete the marker lines.`);
+        throw new UsageError(`"${p}" has two takes of a setting — yours and the online copy's — left by getting the latest changes. Open it, keep the one you want and delete the marker lines.`);
       }
       try {
         const parsed = parseYaml(raw) ?? {};
@@ -1983,7 +1983,7 @@ async function vendorNpmExtension(projectDir, input, exportName, options, commit
   }
   const warnings = [...installed.warnings];
   await finalizeNpmPluginInstall(installed).catch((error) => {
-    warnings.push(`The extension was installed, but an old backup could not be removed: ` + `${error instanceof Error ? error.message : String(error)}`);
+    warnings.push(`The extension was installed, but an old download could not be removed: ` + `${error instanceof Error ? error.message : String(error)}`);
   });
   warnings.push(...await retireLegacyCopies(projectDir, installed.name));
   try {

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

@@ -6,7 +6,8 @@ import {
 import {
   capabilitiesFor,
   detectProjectSource,
-  findEnclosingRepoDir
+  findEnclosingRepoDir,
+  syncRemoteFor
 } from "./index-v5mp7a6q.js";
 
 // src/lib/git-fs.ts
@@ -214,6 +215,7 @@ function gitScopeFor(source) {
   return source.repoRoot || source.path;
 }
 var HISTORY_PAGE_LIMIT = 100;
+var NO_VERSION_HISTORY = "This book isn't keeping version history yet. Turn on version history first.";
 var DEFAULT_AUTHOR = "gutterpress";
 var DEFAULT_EMAIL = "noreply@gutterpress.local";
 var DEFAULT_BRANCH = "main";
@@ -385,7 +387,7 @@ class LocalFolderSourceProvider {
   async initVersionHistory(options) {
     const dir = options.projectDir;
     if (await findEnclosingRepoDir(dir) !== undefined) {
-      throw new Error("This folder is already inside a versioned book, so gutterpress " + "won't create a separate history here.");
+      throw new Error("This folder is already inside a book that keeps version history, so " + "Gutterpress won't start a separate one here.");
     }
     return withRepoLock(dir, async () => {
       const cache = {};
@@ -409,7 +411,7 @@ class LocalFolderSourceProvider {
     });
   }
   snapshot() {
-    return Promise.reject(new Error("This book has no version history yet. Enable version history first."));
+    return Promise.reject(new Error(NO_VERSION_HISTORY));
   }
   listHistory() {
     return Promise.resolve([]);
@@ -418,7 +420,7 @@ class LocalFolderSourceProvider {
     return Promise.resolve({ entries: [], hasMore: false });
   }
   restore() {
-    return Promise.reject(new Error("This book has no version history yet. Enable version history first."));
+    return Promise.reject(new Error(NO_VERSION_HISTORY));
   }
 }
 
@@ -517,7 +519,7 @@ async function snapshotWorkingTreeUnlocked(options) {
   const workdirClean = changes.adds.length === 0 && changes.removes.length === 0;
   if (workdirClean && !staleStaging) {
     logger.debug("snapshot", "no changes — skipping");
-    throw new Error("No changes since the last snapshot — there is nothing new to save.");
+    throw new Error("Nothing new to save — your last version already has everything.");
   }
   if (workdirClean && staleStaging && await stageMatchesHead(dir, cache)) {
     logger.debug("snapshot", "stale marker outlived a completed commit — clearing, not recommitting");
@@ -555,7 +557,7 @@ async function snapshotWorkingTreeUnlocked(options) {
   };
 }
 function isNoChangesError(e) {
-  return e instanceof Error && /no changes since the last snapshot/i.test(e.message);
+  return e instanceof Error && /nothing new to save/i.test(e.message);
 }
 async function countUnversionedChanges(projectDir) {
   const source = await detectProjectSource(projectDir);
@@ -586,14 +588,13 @@ function gitDirFor(projectDir) {
 function snapshotStagingMarkerPath(projectDir) {
   return path2.join(gitDirFor(projectDir), SNAPSHOT_STAGING_MARKER);
 }
-var RESTORE_BACKUP_MESSAGE = "Automatic backup before restoring an earlier version";
-var AUTO_SNAPSHOT_MESSAGE = "Automatic snapshot";
+var RESTORE_BACKUP_MESSAGE = "Automatic version before restoring";
+var AUTO_SNAPSHOT_MESSAGE = "Automatic version";
 async function restoreVersionWithBackup(options) {
   const { projectDir, id, authorName, authorEmail } = options;
   const source = await detectProjectSource(projectDir);
-  if (source.type !== "local-git-folder") {
-    throw new Error("This book has no version history yet. Enable version history first.");
-  }
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
   const provider = new LocalGitSourceProvider(source);
   const repoDir = gitScopeFor(source);
   return withRepoLock(repoDir, async () => {
@@ -610,42 +611,105 @@ async function restoreVersionWithBackup(options) {
     try {
       await provider.restoreUnlocked({ projectDir, id });
     } catch (cause) {
-      throw new Error(backupId ? "The restore could not be completed, but your work is safe — it was " + `automatically saved as a backup snapshot (${backupId.slice(0, 7)}) ` + "and appears in your version history." : "The restore could not be completed. Your book files were not changed.", { cause });
+      throw new Error(backupId ? "Going back to that version didn't finish, but your work is safe — it was " + "saved as an automatic version and appears in your version history." : "Going back to that version didn't finish. Your book files were not changed.", { cause });
     }
     return { restoredId: id, backupId };
   });
 }
-var SWITCH_BRANCH_SNAPSHOT_MESSAGE = "Saved before switching copy";
-async function listLocalBranches(dir) {
-  const source = await detectProjectSource(dir);
-  if (source.type !== "local-git-folder")
-    return null;
-  const repoDir = gitScopeFor(source);
-  const [local, current, remotes] = await Promise.all([
-    git.listBranches({ fs: gitFs, dir: repoDir }),
-    git.currentBranch({ fs: gitFs, dir: repoDir, fullname: false }).catch(() => {
+var SWITCH_BRANCH_SNAPSHOT_MESSAGE = "Saved before switching revision";
+async function readRevisionRefs(dir) {
+  const [names, current, remote] = await Promise.all([
+    git.listBranches({ fs: gitFs, dir }),
+    git.currentBranch({ fs: gitFs, dir, fullname: false }).catch(() => {
       return;
     }),
-    git.listRemotes({ fs: gitFs, dir: repoDir }).catch(() => [])
+    syncRemoteFor(dir)
   ]);
-  const localNames = new Set(local);
-  const remoteOnly = new Set;
-  for (const { remote } of remotes) {
-    const names = await git.listBranches({ fs: gitFs, dir: repoDir, remote }).catch(() => []);
-    for (const name of names) {
-      if (name === "HEAD")
-        continue;
-      if (!localNames.has(name))
-        remoteOnly.add(name);
-    }
-  }
+  const tips = async (branches, prefix) => new Map(await Promise.all(branches.map(async (name) => [name, await git.resolveRef({ fs: gitFs, dir, ref: `${prefix}${name}` })])));
+  const onlineNames = remote ? (await git.listBranches({ fs: gitFs, dir, remote: remote.remote }).catch(() => [])).filter((name) => name !== "HEAD") : [];
   return {
     current: current ?? null,
-    branches: [...localNames, ...remoteOnly].sort(),
-    remoteOnly: [...remoteOnly].sort()
+    local: await tips(names, "refs/heads/"),
+    online: await tips(onlineNames, `refs/remotes/${remote?.remote}/`)
   };
 }
-async function resolveCopy(repoDir, branch) {
+var ANCESTRY_DEPTH = 1000;
+async function isContained(dir, tip, inTip, cache) {
+  if (tip === inTip)
+    return true;
+  return git.isDescendent({ fs: gitFs, dir, cache, oid: inTip, ancestor: tip, depth: ANCESTRY_DEPTH }).catch(() => false);
+}
+async function listRevisions(dir) {
+  const source = await detectProjectSource(dir);
+  if (source.type !== "local-git-folder")
+    return null;
+  const repoDir = gitScopeFor(source);
+  const { current, local, online } = await readRevisionRefs(repoDir);
+  const cache = {};
+  const names = [...new Set([...local.keys(), ...online.keys()])].sort((a, b) => a.localeCompare(b));
+  const revisions = await Promise.all(names.map(async (name) => {
+    const here = local.get(name);
+    const there = online.get(name);
+    return {
+      name,
+      current: name === current,
+      where: here && there ? "online" : here ? "this-computer" : "online-only",
+      notBackedUp: Boolean(here && there && !await isContained(repoDir, here, there, cache))
+    };
+  }));
+  return { current, revisions };
+}
+function revisionNameFrom(input) {
+  return input.trim().replace(/\s+/g, "-");
+}
+var UNUSABLE_REVISION_NAME = /[\u0000- \u007f~^:?*[\\/<>"|]|\.\.|@\{|^[-.]|\.$|\.lock$|^@$/;
+var REVISION_NAME_MAX = 100;
+async function assertFreeRevisionName(repoDir, name) {
+  if (!name)
+    throw new Error("Give the revision a name.");
+  if (name.length > REVISION_NAME_MAX || UNUSABLE_REVISION_NAME.test(name)) {
+    throw new Error(`"${name}" can't be a revision name. Use plain words, numbers and dashes, up to ${REVISION_NAME_MAX} characters.`);
+  }
+  const { local, online } = await readRevisionRefs(repoDir);
+  const taken = (names) => [...names].find((n) => n.toLowerCase() === name.toLowerCase());
+  const here = taken(local.keys());
+  if (here)
+    throw new Error(`There's already a revision called "${here}". Pick a different name.`);
+  const there = taken(online.keys());
+  if (there) {
+    throw new Error(`"${there}" is already a revision in the online copy. Switch to it, or pick a different name.`);
+  }
+}
+async function saveUnsavedWork(options, cache) {
+  try {
+    await snapshotWorkingTreeUnlocked({
+      projectDir: options.projectDir,
+      repoRoot: options.repoDir,
+      message: SWITCH_BRANCH_SNAPSHOT_MESSAGE,
+      authorName: options.authorName,
+      authorEmail: options.authorEmail,
+      cache
+    });
+  } catch (e) {
+    if (!isNoChangesError(e))
+      throw e;
+  }
+}
+async function createRevision(options) {
+  const { projectDir, authorName, authorEmail } = options;
+  const source = await detectProjectSource(projectDir);
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
+  const repoDir = gitScopeFor(source);
+  const name = revisionNameFrom(options.name);
+  return withRepoLock(repoDir, async () => {
+    await assertFreeRevisionName(repoDir, name);
+    await saveUnsavedWork({ projectDir, repoDir, authorName, authorEmail }, {});
+    await git.branch({ fs: gitFs, dir: repoDir, ref: name, checkout: true });
+    return { current: name };
+  });
+}
+async function resolveRevision(repoDir, branch) {
   const local = await git.resolveRef({ fs: gitFs, dir: repoDir, ref: `refs/heads/${branch}` }).catch(() => {
     return;
   });
@@ -659,7 +723,7 @@ async function resolveCopy(repoDir, branch) {
     if (oid)
       return { oid, remote };
   }
-  throw new Error(`Couldn't find a copy named "${branch}" — it may have been renamed or deleted.`);
+  throw new Error(`Couldn't find a revision named "${branch}" — it may have been renamed or deleted.`);
 }
 function isCheckoutConflictError(e) {
   return e?.code === "CheckoutConflictError";
@@ -696,29 +760,16 @@ async function diffCommitPaths(dir, fromOid, toOid, cache) {
 async function switchBranch(options) {
   const { projectDir, branch, authorName, authorEmail } = options;
   const source = await detectProjectSource(projectDir);
-  if (source.type !== "local-git-folder") {
-    throw new Error("This book has no version history yet. Enable version history first.");
-  }
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
   const repoDir = gitScopeFor(source);
   return withRepoLock(repoDir, async () => {
     const cache = {};
-    try {
-      await snapshotWorkingTreeUnlocked({
-        projectDir,
-        repoRoot: repoDir,
-        message: SWITCH_BRANCH_SNAPSHOT_MESSAGE,
-        authorName,
-        authorEmail,
-        cache
-      });
-    } catch (e) {
-      if (!isNoChangesError(e))
-        throw e;
-    }
+    await saveUnsavedWork({ projectDir, repoDir, authorName, authorEmail }, cache);
     const fromOid = await git.resolveRef({ fs: gitFs, dir: repoDir, ref: "HEAD" }).catch(() => {
       return;
     });
-    const { oid: toOid, remote } = await resolveCopy(repoDir, branch);
+    const { oid: toOid, remote } = await resolveRevision(repoDir, branch);
     try {
       await git.checkout({
         fs: gitFs,
@@ -730,7 +781,7 @@ async function switchBranch(options) {
       });
     } catch (e) {
       if (isCheckoutConflictError(e)) {
-        throw new Error("Couldn't switch copies — some files changed on disk right as the switch " + "started. Try again.", { cause: e });
+        throw new Error("Couldn't switch revisions — some files changed on disk right as the switch " + "started. Try again.", { cause: e });
       }
       throw e;
     }
@@ -742,4 +793,4 @@ async function switchBranch(options) {
   });
 }
 
-export { gitFs, errorLogData, resolveLogger, gitScopeFor, HISTORY_PAGE_LIMIT, 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, listLocalBranches, switchBranch };
+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 };