gutterpress 0.11.23-alpha.4 → 0.11.23-alpha.6

package/README.md

@@ -162,7 +162,7 @@ gutterpress new <name> [--kind <id>] [options]
   --targets <ids>          Publish targets recorded in the manifest (comma-separated: dtrpg, itch; or "none") — default: the preset's
   --page-width <pt>        Trim width in points, 72pt = 1in (required with --preset custom; optional override otherwise)
   --page-height <pt>       Trim height in points, 72pt = 1in (required with --preset custom; optional override otherwise)
-  --git                    Initialise local version history (default: true; use --no-git to skip)
+  --git                    Keep version history on this computer (default: true; use --no-git to skip)
   --no-git
 ```
 

package/dist/api/index.d.ts

@@ -53,8 +53,8 @@ export { readManifestFields, setManifestFields, setActiveStyles, } from "../lib/
 export type { ProjectConfigFields } from "../lib/manifest-config.ts";
 export { readPageSetup, setPageSetup } from "../lib/page-size.ts";
 export type { PageMargin, PageSetup, PageSetupChange, PageSizeChoice, PageSizePoints } from "../lib/page-size.ts";
-export { providerFor, restoreVersionWithBackup, isNoChangesError, countUnversionedChanges, whenGitIdle, AUTO_SNAPSHOT_MESSAGE, RESTORE_BACKUP_MESSAGE, HISTORY_PAGE_LIMIT, listLocalBranches, switchBranch, SWITCH_BRANCH_SNAPSHOT_MESSAGE, } from "../lib/source-provider.ts";
-export type { ListHistoryOptions, HistoryPage, UnversionedChanges, LocalBranches, SwitchBranchOptions, SwitchBranchResult, } from "../lib/source-provider.ts";
+export { providerFor, restoreVersionWithBackup, isNoChangesError, countUnversionedChanges, whenGitIdle, AUTO_SNAPSHOT_MESSAGE, RESTORE_BACKUP_MESSAGE, HISTORY_PAGE_LIMIT, listRevisions, createRevision, revisionNameFrom, switchBranch, SWITCH_BRANCH_SNAPSHOT_MESSAGE, } from "../lib/source-provider.ts";
+export type { ListHistoryOptions, HistoryPage, UnversionedChanges, Revision, RevisionList, CreateRevisionOptions, SwitchBranchOptions, SwitchBranchResult, } from "../lib/source-provider.ts";
 export { describeVersions, listOnlineVersions, compareVersionFile, exportVersionTree, VERSION_CHANGES_SHOWN, } from "../lib/version-changes.ts";
 export type { VersionEntry, VersionFileChange, CompareRow } from "../lib/version-changes.ts";
 export { autoSnapshotDelayMs, autoSyncDelayMs, isGitInternalPath, AUTO_SNAPSHOT_DEFAULT_MINUTES, AUTO_SYNC_MIN_MINUTES, AUTO_SYNC_MAX_MINUTES, AUTO_SYNC_DEFAULT_MINUTES, AUTO_SYNC_PUSH_INTERVAL_MINUTES, } from "../lib/host-policy.ts";
@@ -80,6 +80,8 @@ export type { GenericTokenConnectInput, GenericAuthOptions, } from "../lib/remot
 export { diagnoseProjectRemote, parseRemoteOrigin, forgeKindForHost, } from "../lib/remote-auth/diagnose.ts";
 export type { ProjectRemoteDiagnosis, DiagnoseProjectRemoteOptions, RemoteProtocol, RemoteGuidanceId, ForgeKind, } from "../lib/remote-auth/diagnose.ts";
 export { syncProject, refreshRemoteCopies, checkRemoteUpdates, SYNC_SNAPSHOT_MESSAGE, } from "../lib/remote-auth/sync.ts";
+export { renameRevision, deleteRevision } from "../lib/remote-auth/revisions.ts";
+export type { RenameRevisionOptions, DeleteRevisionOptions } from "../lib/remote-auth/revisions.ts";
 export { repairOnlineBackup, REPAIR_SNAPSHOT_MESSAGE, type RepairOnlineBackupOptions, type RepairOnlineBackupResult, } from "../lib/remote-auth/repair.ts";
 export { scorchedEarth, type ScorchedEarthOptions, type ScorchedEarthResult, } from "../lib/remote-auth/scorched-earth.ts";
 export type { SyncOutcome, SyncProjectOptions, KeptBothFile, } from "../lib/remote-auth/sync.ts";
@@ -95,7 +97,7 @@ export { publishConnectionStatus, publishCredentialKey, listPublishAccounts, } f
 export type { PublishSavedAccount } from "../lib/publish/types.ts";
 export { PublishSelectionsStore } from "../lib/publish/selections.ts";
 export type { PublishAccountSelection } from "../lib/publish/selections.ts";
-export { readPublishSettings, setPublishProviderConfig, } from "../lib/publish/manifest-publish.ts";
+export { readPublishSettings, savePublishSettings, setPublishProviderConfig, } from "../lib/publish/manifest-publish.ts";
 export type { PublishProvider, PublishProviderId, PublishProviderInfo, PublishProviderKind, PublishConfigField, PublishArtifact, PublishArtifactFormat, PublishAuthStatus, PublishDeps, PublishListingMetadata, PublishOutcome, PublishProduct, PublishProject, PublishRequest, PreflightIssue, CommandRunner, CommandResult, PublishPluginContext, PublishPluginFunction, PublishPluginResult, } from "../lib/publish/types.ts";
 export { resolveLogger } from "../lib/remote-auth/operation-log.ts";
 export type { OperationLogger, LogData } from "../lib/remote-auth/operation-log.ts";

package/dist/api/index.js

@@ -30,6 +30,7 @@ import {
   connectGoogleDrive,
   connectPublishProvider,
   defaultConfigDir,
+  deleteRevision,
   deleteSnippet,
   describeVersions,
   diagnoseProjectRemote,
@@ -70,6 +71,7 @@ import {
   readPageSetup,
   readPublishSettings,
   refreshRemoteCopies,
+  renameRevision,
   repairOnlineBackup,
   requireGoogleClientCredentials,
   resolveActiveStyles,
@@ -85,6 +87,7 @@ import {
   runPublish,
   sanitizeCloneFolderName,
   saveProjectAsTemplate,
+  savePublishSettings,
   saveSnippet,
   scaffoldExtension,
   scaffoldProject,
@@ -101,7 +104,7 @@ import {
   substituteVariables,
   syncProject,
   testRemoteAccess
-} from "../index-ea94zbq4.js";
+} from "../index-ejbfetdn.js";
 import {
   DEFAULT_NPM_REGISTRY,
   MANIFEST_FILENAMES,
@@ -130,7 +133,7 @@ import {
   setExtensionEnabled,
   updateExtensions,
   validateProjectExtensions
-} from "../index-kaks3mm2.js";
+} from "../index-cmakyf43.js";
 import {
   BUNDLED_EXTENSIONS,
   EXTENSION_MANIFEST_FILENAME,
@@ -145,9 +148,9 @@ import {
   pathEscapesFolder,
   readExtensionMeta,
   resolveExtension
-} from "../index-8ywkd2sv.js";
+} from "../index-1zqkfzcd.js";
 import"../index-ht1bcqdd.js";
-import"../index-5kh4c78h.js";
+import"../index-2vxzxyyj.js";
 import {
   BuildError
 } from "../index-46ycxe6r.js";
@@ -163,14 +166,16 @@ import {
   RESTORE_BACKUP_MESSAGE,
   SWITCH_BRANCH_SNAPSHOT_MESSAGE,
   countUnversionedChanges,
+  createRevision,
   isNoChangesError,
-  listLocalBranches,
+  listRevisions,
   providerFor,
   resolveLogger,
   restoreVersionWithBackup,
+  revisionNameFrom,
   switchBranch,
   whenGitIdle
-} from "../index-h6yk5tjx.js";
+} from "../index-cw03e9p4.js";
 import {
   EXTENSIONS_DIR
 } from "../index-5x42amh8.js";
@@ -204,12 +209,14 @@ export {
   scaffoldProject,
   scaffoldExtension,
   saveSnippet,
+  savePublishSettings,
   saveProjectAsTemplate,
   sanitizeCloneFolderName,
   sameExtension,
   runPublish,
   runBuild,
   revokeGoogleCredential,
+  revisionNameFrom,
   restoreVersionWithBackup,
   restorePinnedExtensions,
   restoreFailureMessage,
@@ -229,6 +236,7 @@ export {
   repoRootForSource,
   repairOnlineBackup,
   reorderExtensions,
+  renameRevision,
   removeExtension,
   refreshRemoteCopies,
   readyProbeExpr,
@@ -249,6 +257,7 @@ export {
   npmRegistryUrl,
   loadManifestWithPath,
   listSnippets,
+  listRevisions,
   listRepoBooks,
   listPublishProviders,
   listPublishAccounts,
@@ -259,7 +268,6 @@ export {
   listMergedSnippets,
   listMarkerComponents,
   listLocationVariants,
-  listLocalBranches,
   listGitHubRepositories,
   listGitHubBranches,
   listCustomTemplates,
@@ -294,7 +302,9 @@ export {
   describeVersions,
   describeExtension,
   deleteSnippet,
+  deleteRevision,
   defaultConfigDir,
+  createRevision,
   countUnversionedChanges,
   connectPublishProvider,
   connectGoogleDrive,

package/dist/{build-c48eer6f.js → build-py643c5a.js}

@@ -1,20 +1,20 @@
 import {
   runBuild,
   splitOutPath
-} from "./cli-93mkaw6v.js";
-import"./cli-d9mm3vvh.js";
+} from "./cli-09jj8w5g.js";
+import"./cli-bnf7eb38.js";
 import"./cli-ht1bcqdd.js";
-import"./cli-54xt7pjg.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"./cli-y6d1arem.js";
-import"./cli-rqh295j9.js";
+import"./cli-55br530w.js";
+import"./cli-x777v272.js";
 import {
   log
-} from "./cli-pspjxnc8.js";
+} from "./cli-tf9tw6at.js";
 import {
   UsageError,
   parseFormat,
@@ -22,7 +22,7 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags
 } from "./cli-d8xjns66.js";
-import"./cli-gnpea9dx.js";
+import"./cli-qzkq9em8.js";
 import {
   BuildError
 } from "./cli-46ycxe6r.js";

package/dist/{cli-93mkaw6v.js → cli-09jj8w5g.js}

@@ -8,7 +8,7 @@ import {
   stampCreator,
   stripAnnotations,
   transparentPages
-} from "./cli-d9mm3vvh.js";
+} from "./cli-bnf7eb38.js";
 import {
   blackTextToGray
 } from "./cli-ht1bcqdd.js";
@@ -17,7 +17,7 @@ import {
   MARGIN_BOX_IGNORED_PROPERTIES,
   getAssetPath,
   lastPageMode
-} from "./cli-54xt7pjg.js";
+} from "./cli-58fsk6d7.js";
 import {
   countLinkAnnotations,
   getImageResolutions,
@@ -42,7 +42,7 @@ import {
 import {
   hasUncommittedChanges,
   listWorkdirChanges
-} from "./cli-a35w7wzg.js";
+} from "./cli-31anr0r9.js";
 import {
   detectProjectSource,
   repoSubPath
@@ -75,7 +75,7 @@ import {
   uniqueExtensionId,
   withFetchTimeout,
   writeManifestDoc
-} from "./cli-y6d1arem.js";
+} from "./cli-55br530w.js";
 import {
   EXTENSION_MANIFEST_FILENAME,
   GUTTERPRESS_CSS,
@@ -96,7 +96,7 @@ import {
   readExtensionMeta,
   resolveDeclaredStyles,
   slugify
-} from "./cli-rqh295j9.js";
+} from "./cli-x777v272.js";
 import {
   PACKAGE_META,
   PACKAGE_VERSION,
@@ -106,7 +106,7 @@ import {
   log,
   setLogLevel,
   warn
-} from "./cli-pspjxnc8.js";
+} from "./cli-tf9tw6at.js";
 import {
   DEBOUNCE,
   UsageError,
@@ -3024,8 +3024,8 @@ function withoutOnlineTag(relPath) {
 }
 var check27 = {
   id: "source.sync.merge-markers",
-  name: "Combined Versions",
-  description: "Finds passages and files still holding two versions (yours and the online version) after a sync",
+  name: "Combined Takes",
+  description: "Finds passages and files still holding two takes (yours and the online copy's) after getting the latest changes",
   category: "source",
   phase: "pre-build",
   async run(ctx) {
@@ -3051,7 +3051,7 @@ var check27 = {
           results.push(finding(check27.id, {
             severity: "error",
             code: "two-versions-passage",
-            message: "This passage has two versions — yours and the online version. Choose one in the editor's Two versions panel, or keep the text you want and delete the marker lines.",
+            message: "This passage has two takes — yours and the online copy's. Choose one in the editor's Two takes panel, or keep the text you want and delete the marker lines.",
             file,
             line: i + 1
           }));
@@ -3060,7 +3060,7 @@ var check27 = {
             results.push(finding(check27.id, {
               severity: "error",
               code: "leftover-version-marker",
-              message: "This marker line is left over from combining two versions — delete it.",
+              message: "This marker line is left over from combining two takes — delete it.",
               file,
               line: i + 1
             }));
@@ -3081,7 +3081,7 @@ var check27 = {
         results.push(finding(check27.id, {
           severity: "warning",
           code: "kept-both-versions",
-          message: `Two versions of ${withoutOnlineTag(rel)} are in your book — keep the one you want, then delete the other.`,
+          message: `Two takes of ${withoutOnlineTag(rel)} are in your book — keep the one you want, then delete the other.`,
           file: sibling
         }));
       }
@@ -5056,7 +5056,7 @@ class PdfOutput {
       const rawPdf = pdfxMode ? path7.join(stage, "raw.pdf") : path7.resolve(pdfFile);
       await fsp2.mkdir(path7.dirname(path7.resolve(pdfFile)), { recursive: true });
       log.info("Rendering HTML to PDF via the Gutterpress engine (native Chromium pagination)");
-      const { buildNativePdf } = await import("./engine-4rzdx6af.js");
+      const { buildNativePdf } = await import("./engine-4rabsgwq.js");
       const engineDiagnostics = await buildNativePdf(htmlFile, rawPdf, {
         title: config.title,
         author: config.authors.length > 0 ? config.authors.join(", ") : undefined,
@@ -6524,7 +6524,7 @@ async function scaffoldProject(options) {
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-knmcam50.js");
+      const { providerFor } = await import("./source-provider-n7vehh6t.js");
       const provider = providerFor({ type: "local-folder", path: projectDir });
       await provider.initVersionHistory({
         projectDir,
@@ -6536,7 +6536,7 @@ async function scaffoldProject(options) {
       versionHistory = "none";
       const { findEnclosingRepoDir } = await import("./project-source-ekcyp63q.js");
       const enclosingRepoDir = await findEnclosingRepoDir(projectDir);
-      versionHistoryError = enclosingRepoDir ? `This book was added to ${path12.basename(enclosingRepoDir)}'s shared version history; save a snapshot to record it.` : e instanceof Error ? e.message : String(e);
+      versionHistoryError = enclosingRepoDir ? `This book was added to ${path12.basename(enclosingRepoDir)}'s shared version history; save a version to record it.` : e instanceof Error ? e.message : String(e);
     }
   }
   const result = {
@@ -8822,7 +8822,7 @@ function publishProviderFor(id) {
 }
 
 // src/lib/publish/plugin-provider.ts
-var RESERVED_SETTINGS = new Set(["format", "credential"]);
+var RESERVED_SETTINGS = new Set(["format", "credential", "enabled"]);
 var isBuiltIn = (id) => listPublishProviders().some((p) => p.id === id);
 var messageOf = (e) => e instanceof Error ? e.message : String(e);
 async function bookExtensions(book) {
@@ -8878,7 +8878,7 @@ async function resolvePublishProvider(id, book) {
   const ext = await bookExtensions(book);
   const npmEntry = ext.extensions.some((c) => !c.path && c.name === id);
   if (npmEntry) {
-    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-m8tj43e7.js");
+    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-fjfn1hrk.js");
     await restoreForCommand2(book.projectDir, { manifestPath: book.manifestPath, failFast: true });
   }
   const publishers = await discover(ext);
@@ -8916,7 +8916,7 @@ function infoFor(p) {
 }
 function pluginProvider(p) {
   let loading;
-  const load = () => loading ??= import("./plugins-sqa4msdk.js").then((m) => m.loadPublishFunction(p));
+  const load = () => loading ??= import("./plugins-vpx7c53c.js").then((m) => m.loadPublishFunction(p));
   return {
     info: infoFor(p),
     async authenticate() {
@@ -8985,7 +8985,10 @@ async function requestFor(provider, options, deps) {
   const { manifest, manifestDir } = await loadManifestWithPath(options.manifestPath ?? options.projectDir, { explicit: options.manifestPath !== undefined });
   const config = resolveConfig({}, manifest);
   const publishSettings = manifest.publish ?? {};
-  const providerConfig = publishSettings[provider.info.id] ?? {};
+  const providerConfig = {
+    ...publishSettings[provider.info.id] ?? {},
+    ...(await deps.selections?.settings(options.projectDir))?.[provider.info.id] ?? {}
+  };
   const bookAccount = typeof providerConfig.credential === "string" ? providerConfig.credential.trim() : "";
   const effectiveAccount = bookAccount || deps.credentialAccount;
   const effectiveDeps = effectiveAccount ? { ...deps, credentialAccount: effectiveAccount } : deps;
@@ -9162,11 +9165,20 @@ async function connectPublishProvider(options, deps) {
     label: account || info10.label,
     createdAt: Date.now()
   };
-  const req = await resolvePublishRequest({
+  const shop = (options.shop ?? "").trim();
+  if (!options.projectDir && info10.id === "shopify" && !shop) {
+    throw new Error("Enter your Shopify store's address (like my-store.myshopify.com) to check the key.");
+  }
+  const req = options.projectDir ? await resolvePublishRequest({
     projectDir: options.projectDir,
     providerId: info10.id,
     ...options.manifestPath ? { manifestPath: options.manifestPath } : {}
-  }, deps);
+  }, deps) : {
+    project: { projectDir: "", title: "", authors: [] },
+    config: shop ? { shop } : {},
+    artifact: { path: "", format: info10.format },
+    deps
+  };
   const trialDeps = {
     ...deps,
     env: {},
@@ -9309,10 +9321,12 @@ import git7 from "isomorphic-git";
 // src/lib/remote-auth/test-access.ts
 import git8 from "isomorphic-git";
 import httpNode2 from "isomorphic-git/http/node";
-// src/lib/remote-auth/repair.ts
+// src/lib/remote-auth/revisions.ts
 import git9 from "isomorphic-git";
-// src/lib/remote-auth/scorched-earth.ts
+// src/lib/remote-auth/repair.ts
 import git10 from "isomorphic-git";
+// src/lib/remote-auth/scorched-earth.ts
+import git11 from "isomorphic-git";
 // src/lib/publish/selections.ts
 import { chmod as chmod2, mkdir as mkdir10, readFile as readFile26, writeFile as writeFile11 } from "node:fs/promises";
 import path21 from "node:path";
@@ -9354,7 +9368,7 @@ class PublishSelectionsStore {
   resolve(providerId, projectDir) {
     return this.enqueue(async () => {
       const data = await this.read();
-      const proj = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId] : undefined;
+      const proj = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId]?.credential : undefined;
       return proj && proj.trim() || data.global[providerId]?.trim() || undefined;
     });
   }
@@ -9362,7 +9376,7 @@ class PublishSelectionsStore {
     return this.enqueue(async () => {
       const data = await this.read();
       const global = data.global[providerId];
-      const project = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId] : undefined;
+      const project = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId]?.credential : undefined;
       return {
         ...project ? { project } : {},
         ...global ? { global } : {}
@@ -9381,17 +9395,35 @@ class PublishSelectionsStore {
     });
   }
   setProject(projectDir, providerId, account) {
+    return this.setSettings(projectDir, providerId, { credential: account });
+  }
+  settings(projectDir) {
+    return this.enqueue(async () => {
+      const data = await this.read();
+      return data.projects[normalizeProjectKey(projectDir)] ?? {};
+    });
+  }
+  setSettings(projectDir, providerId, values) {
     return this.enqueue(async () => {
       const data = await this.read();
       const key = normalizeProjectKey(projectDir);
-      const a = (account ?? "").trim();
-      const bucket = data.projects[key] ?? {};
-      if (a)
-        bucket[providerId] = a;
+      const book = data.projects[key] ?? {};
+      const mine = { ...book[providerId] };
+      for (const [k, v] of Object.entries(values)) {
+        const text = (v ?? "").trim();
+        if (text)
+          mine[k] = text;
+        else
+          delete mine[k];
+      }
+      if (JSON.stringify(mine) === JSON.stringify(book[providerId] ?? {}))
+        return;
+      if (Object.keys(mine).length > 0)
+        book[providerId] = mine;
       else
-        delete bucket[providerId];
-      if (Object.keys(bucket).length > 0)
-        data.projects[key] = bucket;
+        delete book[providerId];
+      if (Object.keys(book).length > 0)
+        data.projects[key] = book;
       else
         delete data.projects[key];
       await this.write(data);