gutterpress 0.11.21 → 0.11.22-alpha.1

package/dist/{new-dre6aw05.js → new-nadp2hvb.js}

@@ -1,33 +1,40 @@
 import {
   BUILT_IN_TEMPLATE_IDS,
   EXTENSION_KINDS,
-  PRESETS,
-  PRESET_IDS,
-  TARGETS,
-  TARGET_IDS,
   scaffoldExtension,
   scaffoldProject
-} from "./cli-j0drzb6f.js";
+} from "./cli-fbwqv7p4.js";
 import {
   resolveGhostscript
-} from "./cli-j79451n6.js";
-import {
-  UsageError,
-  rejectExtraPositionals,
-  rejectUnknownFlags
-} from "./cli-sqkccnm7.js";
+} from "./cli-yejbb9f8.js";
 import"./cli-ht1bcqdd.js";
-import"./cli-b57adna7.js";
-import {
-  EXIT_CODES
-} from "./cli-46ycxe6r.js";
+import"./cli-8hccw62p.js";
 import"./cli-sth219v1.js";
 import"./cli-eyyggect.js";
 import {
   isToolAvailable
 } from "./cli-asap4t1z.js";
-import"./cli-5qr3z0qa.js";
+import"./cli-habkc5ng.js";
 import"./cli-v5mp7a6q.js";
+import {
+  PRESETS,
+  PRESET_IDS,
+  TARGETS,
+  TARGET_IDS
+} from "./cli-9vy4b6ec.js";
+import"./cli-pfrg1r9x.js";
+import"./cli-5553w972.js";
+import {
+  UsageError,
+  rejectExtraPositionals,
+  rejectUnknownFlags
+} from "./cli-d8xjns66.js";
+import"./cli-gc9av5hs.js";
+import"./cli-gmm3bdeq.js";
+import {
+  EXIT_CODES
+} from "./cli-46ycxe6r.js";
+import"./cli-h3phdstf.js";
 import"./cli-37x76zdn.js";
 
 // src/commands/new.ts

package/dist/plugins-gy4q9vaa.js

@@ -0,0 +1,26 @@
+import {
+  __resetPathPluginCacheForTests,
+  applyPlugins,
+  collectPluginCss,
+  collectPluginStyleGroups,
+  collectPluginStylePaths,
+  loadPlugin,
+  loadPlugins,
+  loadPluginsWithCss,
+  loadPublishFunction
+} from "./cli-pfrg1r9x.js";
+import"./cli-5553w972.js";
+import"./cli-gc9av5hs.js";
+import"./cli-h3phdstf.js";
+import"./cli-37x76zdn.js";
+export {
+  loadPublishFunction,
+  loadPluginsWithCss,
+  loadPlugins,
+  loadPlugin,
+  collectPluginStylePaths,
+  collectPluginStyleGroups,
+  collectPluginCss,
+  applyPlugins,
+  __resetPathPluginCacheForTests
+};

package/dist/plugins-yeh4shd7.js

@@ -0,0 +1,24 @@
+import {
+  __resetPathPluginCacheForTests,
+  applyPlugins,
+  collectPluginCss,
+  collectPluginStyleGroups,
+  collectPluginStylePaths,
+  loadPlugin,
+  loadPlugins,
+  loadPluginsWithCss,
+  loadPublishFunction
+} from "./index-38e18a7j.js";
+import"./index-r7jcsk6h.js";
+import"./index-37x76zdn.js";
+export {
+  loadPublishFunction,
+  loadPluginsWithCss,
+  loadPlugins,
+  loadPlugin,
+  collectPluginStylePaths,
+  collectPluginStyleGroups,
+  collectPluginCss,
+  applyPlugins,
+  __resetPathPluginCacheForTests
+};

package/dist/{preflight-1k1zkg1p.js → preflight-c6q25xqa.js}

@@ -1,27 +1,34 @@
 import {
   executeValidation,
-  publishTargetFor,
   reportMissingTools
-} from "./cli-j0drzb6f.js";
+} from "./cli-fbwqv7p4.js";
+import"./cli-yejbb9f8.js";
+import"./cli-ht1bcqdd.js";
+import"./cli-8hccw62p.js";
+import"./cli-sth219v1.js";
+import"./cli-eyyggect.js";
+import"./cli-asap4t1z.js";
+import"./cli-habkc5ng.js";
+import"./cli-v5mp7a6q.js";
+import {
+  publishTargetFor
+} from "./cli-9vy4b6ec.js";
+import"./cli-pfrg1r9x.js";
 import {
   log
-} from "./cli-j79451n6.js";
+} from "./cli-5553w972.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-sqkccnm7.js";
-import"./cli-ht1bcqdd.js";
-import"./cli-b57adna7.js";
+} from "./cli-d8xjns66.js";
+import"./cli-gc9av5hs.js";
+import"./cli-gmm3bdeq.js";
 import {
   BuildError,
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
-import"./cli-sth219v1.js";
-import"./cli-eyyggect.js";
-import"./cli-asap4t1z.js";
-import"./cli-5qr3z0qa.js";
-import"./cli-v5mp7a6q.js";
+import"./cli-h3phdstf.js";
 import"./cli-37x76zdn.js";
 
 // src/commands/preflight.ts

package/dist/{preview-dtrksvxf.js → preview-y8chv4cb.js}

@@ -1,15 +1,25 @@
-import {
-  previewArgs
-} from "./cli-75qkn0k5.js";
 import {
   openPath,
   runBuild,
   splitOutPath,
   startPreviewServer
-} from "./cli-j0drzb6f.js";
+} from "./cli-fbwqv7p4.js";
+import"./cli-yejbb9f8.js";
+import {
+  previewArgs
+} from "./cli-75qkn0k5.js";
+import"./cli-ht1bcqdd.js";
+import"./cli-8hccw62p.js";
+import"./cli-sth219v1.js";
+import"./cli-eyyggect.js";
+import"./cli-asap4t1z.js";
+import"./cli-habkc5ng.js";
+import"./cli-v5mp7a6q.js";
+import"./cli-9vy4b6ec.js";
+import"./cli-pfrg1r9x.js";
 import {
   log
-} from "./cli-j79451n6.js";
+} from "./cli-5553w972.js";
 import {
   UsageError,
   parseFormat,
@@ -17,17 +27,13 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolvePort
-} from "./cli-sqkccnm7.js";
-import"./cli-ht1bcqdd.js";
-import"./cli-b57adna7.js";
+} from "./cli-d8xjns66.js";
+import"./cli-gc9av5hs.js";
+import"./cli-gmm3bdeq.js";
 import {
   BuildError
 } from "./cli-46ycxe6r.js";
-import"./cli-sth219v1.js";
-import"./cli-eyyggect.js";
-import"./cli-asap4t1z.js";
-import"./cli-5qr3z0qa.js";
-import"./cli-v5mp7a6q.js";
+import"./cli-h3phdstf.js";
 import"./cli-37x76zdn.js";
 
 // src/commands/preview.ts

package/dist/{publish-g1ytnrmr.js → publish-3qwvxsxa.js}

@@ -2,35 +2,44 @@ import {
   connectGoogleDrive,
   connectPublishProvider,
   disconnectPublishCredential,
+  listBookPublishProviders,
   listPublishAccounts,
-  listPublishProviders,
-  loadManifestWithPath,
   openPath,
   publishConnectionStatus,
   publishCredentialKey,
-  publishProviderFor,
   resolvePublishFormat,
+  resolvePublishProvider,
   runPublish
-} from "./cli-j0drzb6f.js";
+} from "./cli-fbwqv7p4.js";
+import {
+  FileTokenStore
+} from "./cli-yejbb9f8.js";
+import"./cli-ht1bcqdd.js";
+import"./cli-8hccw62p.js";
+import"./cli-sth219v1.js";
+import"./cli-eyyggect.js";
+import"./cli-asap4t1z.js";
+import"./cli-habkc5ng.js";
+import"./cli-v5mp7a6q.js";
+import {
+  loadManifestWithPath
+} from "./cli-9vy4b6ec.js";
+import"./cli-pfrg1r9x.js";
 import {
-  FileTokenStore,
   log
-} from "./cli-j79451n6.js";
+} from "./cli-5553w972.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-sqkccnm7.js";
-import"./cli-ht1bcqdd.js";
-import"./cli-b57adna7.js";
+} from "./cli-d8xjns66.js";
+import"./cli-gc9av5hs.js";
+import"./cli-gmm3bdeq.js";
 import {
+  BuildError,
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
-import"./cli-sth219v1.js";
-import"./cli-eyyggect.js";
-import"./cli-asap4t1z.js";
-import"./cli-5qr3z0qa.js";
-import"./cli-v5mp7a6q.js";
+import"./cli-h3phdstf.js";
 import"./cli-37x76zdn.js";
 
 // src/commands/publish.ts
@@ -100,7 +109,7 @@ var commandArgs = {
   },
   provider: {
     type: "string",
-    description: "Provider id: itch | drivethrurpg | kdp | azure-swa | shopify | gdrive"
+    description: "Provider id: itch | drivethrurpg | kdp | azure-swa | shopify | gdrive, or a publishing plugin's package name (experimental)"
   },
   list: { type: "boolean", description: "List providers and connection status" },
   connect: {
@@ -161,7 +170,10 @@ var publish_default = defineCommand({
         });
         publishSettings = manifest.publish ?? {};
       } catch {}
-      const providers = listPublishProviders();
+      const providers = await listBookPublishProviders({
+        projectDir: projectDir2,
+        ...manifestArg !== undefined ? { manifestPath: manifestArg } : {}
+      });
       const rows = await Promise.all(providers.map(async (p) => {
         const status = await publishConnectionStatus(p, deps);
         const accounts = p.credential.required ? await listPublishAccounts(p, deps) : [];
@@ -172,7 +184,8 @@ var publish_default = defineCommand({
           kind: p.kind,
           format: resolvePublishFormat(p, providerConfig),
           connected: status.connected,
-          accounts
+          accounts,
+          ...p.experimental ? { experimental: true } : {}
         };
       }));
       if (json) {
@@ -180,7 +193,7 @@ var publish_default = defineCommand({
 `);
       } else {
         for (const r of rows) {
-          const status = r.kind === "guided" ? "no key needed" : r.connected ? "connected" : "not connected";
+          const status = r.experimental ? "experimental" : r.kind === "guided" ? "no key needed" : r.connected ? "connected" : "not connected";
           log.info(`${r.id.padEnd(13)} ${r.label.padEnd(22)} ${r.kind.padEnd(6)} ${r.format.padEnd(4)} ${status}`);
           for (const acc of r.accounts) {
             log.info(`    • ${acc.account ? acc.account : "(default)"}`);
@@ -191,17 +204,20 @@ var publish_default = defineCommand({
     }
     const providerId = typeof args.provider === "string" ? args.provider : "";
     if (!providerId) {
-      log.error("Specify a provider: gutterpress publish --provider <itch|drivethrurpg|kdp|azure-swa|shopify|gdrive> (or --list).");
+      log.error("Specify a provider: gutterpress publish --provider <itch|drivethrurpg|kdp|azure-swa|shopify|gdrive> " + "or a publishing plugin's package name (or --list).");
       process.exit(EXIT_CODES.USAGE);
     }
+    const projectDir = path.resolve(args.project ?? ".");
     let provider;
     try {
-      provider = publishProviderFor(providerId);
+      provider = await resolvePublishProvider(providerId, {
+        projectDir,
+        ...typeof args.manifest === "string" ? { manifestPath: args.manifest } : {}
+      });
     } catch (e) {
       log.error(e instanceof Error ? e.message : String(e));
-      process.exit(EXIT_CODES.USAGE);
+      process.exit(e instanceof BuildError ? e.exitCode : EXIT_CODES.USAGE);
     }
-    const projectDir = path.resolve(args.project ?? ".");
     const account = typeof args.account === "string" ? args.account.trim() : "";
     if (args.disconnect) {
       const key = publishCredentialKey(provider.info.credential.host, account);
@@ -211,7 +227,7 @@ var publish_default = defineCommand({
     }
     if (args.connect) {
       if (!provider.info.credential.required) {
-        log.info(`${provider.info.label} is a guided provider — no API key needed. Just run: gutterpress publish --provider ${provider.info.id}`);
+        log.info(provider.info.experimental ? `${provider.info.label} is a publishing plugin — it manages its own credentials (see its documentation). Just run: gutterpress publish --provider ${provider.info.id}` : `${provider.info.label} is a guided provider — no API key needed. Just run: gutterpress publish --provider ${provider.info.id}`);
         return;
       }
       if (provider.info.credential.connect === "oauth") {
@@ -264,6 +280,7 @@ Create one at: ${provider.info.credential.tokenUrl}` : ""));
       result = await runPublish({
         projectDir,
         providerId: provider.info.id,
+        provider,
         manifestPath: typeof args.manifest === "string" ? args.manifest : undefined,
         artifactPath: typeof args.file === "string" ? args.file : undefined,
         dryRun: !!args["dry-run"]

package/dist/render.js

@@ -1477,6 +1477,124 @@ var GP_CLASSES = new Set([
   "gp-continued"
 ]);
 
+// src/lib/two-versions-markers.ts
+var YOUR_VERSION_LABEL = "your version";
+var ONLINE_VERSION_LABEL = "online version";
+var TWO_VERSIONS_OPEN = `<<<<<<< ${YOUR_VERSION_LABEL}`;
+var TWO_VERSIONS_SEPARATOR = "=======";
+var TWO_VERSIONS_CLOSE = `>>>>>>> ${ONLINE_VERSION_LABEL}`;
+
+// src/lib/markdown/two-versions.ts
+var TWO_VERSIONS_CSS = `
+.gp-two-versions {
+  margin: 1em 0;
+  border: 2px dashed #b7791f;
+  border-radius: 6px;
+  break-inside: avoid;
+}
+.gp-two-versions > .gp-version {
+  padding: 0.5em 0.9em;
+}
+.gp-two-versions > .gp-version + .gp-version {
+  border-top: 2px dashed #b7791f;
+}
+.gp-two-versions > .gp-version > .gp-version-text {
+  margin: 0;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  font-size: 0.85em;
+}
+.gp-two-versions > .gp-version::before {
+  content: attr(data-label);
+  display: block;
+  margin-bottom: 0.35em;
+  font-family: system-ui, sans-serif;
+  font-size: 0.7em;
+  font-weight: 700;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: #b7791f;
+}
+`;
+function lineText(state, line) {
+  return state.src.slice(state.bMarks[line] + state.tShift[line], state.eMarks[line]);
+}
+var MARKER_LINE = /^@[a-z]/;
+function hasMarkerLine(state, from, to) {
+  for (let line = from;line < to; line++) {
+    if (MARKER_LINE.test(lineText(state, line)))
+      return true;
+  }
+  return false;
+}
+function pushVerbatim(state, from, to) {
+  const raw = state.getLines(from, to, 0, false);
+  const token = state.push("html_block", "", 0);
+  token.map = [from, to];
+  token.block = true;
+  token.content = `<pre class="gp-version-text">${state.md.utils.escapeHtml(raw)}</pre>
+`;
+}
+function pushVersion(state, which, label, from, to) {
+  const open = state.push("two_version_open", "div", 1);
+  open.attrSet("class", `gp-version gp-version-${which}`);
+  open.attrSet("data-label", label);
+  open.map = [from, to];
+  open.block = true;
+  if (hasMarkerLine(state, from, to)) {
+    pushVerbatim(state, from, to);
+  } else {
+    state.parentType = "container";
+    state.lineMax = to;
+    state.md.block.tokenize(state, from, to);
+  }
+  const close = state.push("two_version_close", "div", -1);
+  close.block = true;
+}
+function twoVersions(state, startLine, endLine, silent) {
+  if (state.sCount[startLine] - state.blkIndent >= 4)
+    return false;
+  if (state.src.charCodeAt(state.bMarks[startLine] + state.tShift[startLine]) !== 60)
+    return false;
+  if (lineText(state, startLine) !== TWO_VERSIONS_OPEN)
+    return false;
+  let separator = -1;
+  let closer = -1;
+  for (let line = startLine + 1;line < endLine; line++) {
+    const text = lineText(state, line);
+    if (separator < 0 && text === TWO_VERSIONS_SEPARATOR)
+      separator = line;
+    else if (text === TWO_VERSIONS_CLOSE) {
+      closer = line;
+      break;
+    } else if (text === TWO_VERSIONS_OPEN)
+      return false;
+  }
+  if (separator < 0 || closer < 0)
+    return false;
+  if (silent)
+    return true;
+  const oldParent = state.parentType;
+  const oldLineMax = state.lineMax;
+  const open = state.push("two_versions_open", "div", 1);
+  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);
+  const close = state.push("two_versions_close", "div", -1);
+  close.block = true;
+  state.parentType = oldParent;
+  state.lineMax = oldLineMax;
+  state.line = closer + 1;
+  return true;
+}
+function gpTwoVersions(md) {
+  md.block.ruler.before("html_block", "two_versions", twoVersions, {
+    alt: ["paragraph", "reference", "blockquote", "list"]
+  });
+}
+
 // src/lib/markdown/table-align.ts
 var ALIGN = /^text-align:(left|center|right)$/;
 function gpTableAlign(md) {
@@ -2352,6 +2470,7 @@ function createMarkdownRenderer(customPlugins) {
   md.use(gpPinScope);
   md.use(gpBlockNames);
   md.use(gpTableAlign);
+  md.use(gpTwoVersions);
   registerImageRule(md);
   if (customPlugins && customPlugins.length > 0) {
     applyPlugins(md, customPlugins);
@@ -2445,6 +2564,7 @@ async function assembleBookHtml(opts) {
     `/* gutterpress markers */
 @layer gp.marker {
 ${MARKER_CSS.trim()}
+${TWO_VERSIONS_CSS.trim()}
 }`,
     `/* gutterpress */
 @layer gp.vocab {

package/dist/{source-provider-pzmz0br9.js → source-provider-2r74a7wp.js}

@@ -21,8 +21,9 @@ import {
   switchBranch,
   whenGitIdle,
   withRepoLock
-} from "./cli-5qr3z0qa.js";
+} from "./cli-habkc5ng.js";
 import"./cli-v5mp7a6q.js";
+import"./cli-h3phdstf.js";
 import"./cli-37x76zdn.js";
 export {
   withRepoLock,

package/dist/{source-provider-qbthnmqw.js → source-provider-qbfknhyy.js}

@@ -21,7 +21,8 @@ import {
   switchBranch,
   whenGitIdle,
   withRepoLock
-} from "./index-qf7y4d85.js";
+} from "./index-93pqkvty.js";
+import"./index-r7jcsk6h.js";
 import"./index-v5mp7a6q.js";
 import"./index-37x76zdn.js";
 export {

package/dist/{validate-yrrq8639.js → validate-w108kk87.js}

@@ -1,25 +1,31 @@
 import {
   executeAndReport
-} from "./cli-j0drzb6f.js";
+} from "./cli-fbwqv7p4.js";
+import"./cli-yejbb9f8.js";
+import"./cli-ht1bcqdd.js";
+import"./cli-8hccw62p.js";
+import"./cli-sth219v1.js";
+import"./cli-eyyggect.js";
+import"./cli-asap4t1z.js";
+import"./cli-habkc5ng.js";
+import"./cli-v5mp7a6q.js";
+import"./cli-9vy4b6ec.js";
+import"./cli-pfrg1r9x.js";
 import {
   log
-} from "./cli-j79451n6.js";
+} from "./cli-5553w972.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-sqkccnm7.js";
-import"./cli-ht1bcqdd.js";
-import"./cli-b57adna7.js";
+} from "./cli-d8xjns66.js";
+import"./cli-gc9av5hs.js";
+import"./cli-gmm3bdeq.js";
 import {
   BuildError,
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
-import"./cli-sth219v1.js";
-import"./cli-eyyggect.js";
-import"./cli-asap4t1z.js";
-import"./cli-5qr3z0qa.js";
-import"./cli-v5mp7a6q.js";
+import"./cli-h3phdstf.js";
 import"./cli-37x76zdn.js";
 
 // src/commands/validate.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutterpress",
-  "version": "0.11.21",
+  "version": "0.11.22-alpha.1",
   "description": "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   "author": "itlackey",
   "license": "MPL-2.0",