gutterpress 0.11.1 → 0.11.3

package/dist/api/index.js

@@ -124,7 +124,7 @@ import {
   syncProject,
   testRemoteAccess,
   validateProjectExtensions
-} from "../index-qmvmvetj.js";
+} from "../index-x6qvmp60.js";
 import {
   BuildError,
   DEFAULT_PRINT_OPTS,

package/dist/{audit-9vv4ncjv.js → audit-80kd4rsz.js}

@@ -1,14 +1,14 @@
 import {
   executeAndReport
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{build-ea05bvs0.js → build-10mm2y0f.js}

@@ -1,17 +1,17 @@
 import {
   runBuild,
   splitOutPath
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   parseFormat,
   parsePdfxFlavor,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{cli-cwv73tkx.js → cli-ff1kqhyv.js}

@@ -13,12 +13,12 @@ import {
   stampCreator,
   stripAnnotations,
   warn
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   DEBOUNCE,
   UsageError,
   resolvePort
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import {
   MARGIN_BOX_IGNORED_PROPERTIES,
   RENDER_TIMEOUT_MS,
@@ -9079,6 +9079,21 @@ async function externalWatchRoots(targets) {
   }
   return [...roots];
 }
+async function extensionFolderFiles(dir) {
+  try {
+    if (!(await fsp3.stat(dir)).isDirectory())
+      return [];
+  } catch {
+    return [];
+  }
+  const meta = await readExtensionMeta(dir);
+  const entry = extensionEntry(meta);
+  return [
+    path10.join(dir, EXTENSION_MANIFEST_FILENAME),
+    ...entry ? [path10.resolve(dir, entry)] : [],
+    ...await collectStyleDependencies(dir, extensionStyleList(meta))
+  ];
+}
 async function externalWatchTargets(projectDir, config) {
   const root = path10.resolve(projectDir);
   let canonicalRoot = root;
@@ -9086,9 +9101,11 @@ async function externalWatchTargets(projectDir, config) {
     canonicalRoot = await fsp3.realpath(root);
   } catch {}
   const styles = await resolveActiveStyles(root, config.styles);
+  const extensionPaths = (config.extensions ?? []).map((p) => p.path).filter((p) => !!p).map((p) => path10.resolve(root, p));
   const candidates = [
     ...await collectStyleDependencies(root, styles),
-    ...(config.extensions ?? []).map((p) => p.path).filter((p) => !!p).map((p) => path10.resolve(root, p))
+    ...extensionPaths,
+    ...(await Promise.all(extensionPaths.map(extensionFolderFiles))).flat()
   ];
   const external = new Set;
   for (const abs of candidates) {

package/dist/{cli-6gg8vwaj.js → cli-hby7qc6t.js}

@@ -4,7 +4,7 @@ import {
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.1",
+  version: "0.11.3",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",

package/dist/{cli-y4vrycpn.js → cli-ypha0473.js}

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import {
   execCapture,
   findTool,

package/dist/cli.js

@@ -6,7 +6,7 @@ import {
   UsageError,
   package_default,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import {
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
@@ -18,16 +18,16 @@ import {
 import { defineCommand, parseArgs, runMain } from "citty";
 import { statSync } from "node:fs";
 var SUBCOMMANDS = {
-  new: () => import("./new-sja9wn5c.js").then((m) => m.default),
-  preview: () => import("./preview-vjwpj4tf.js").then((m) => m.default),
-  build: () => import("./build-ea05bvs0.js").then((m) => m.default),
-  publish: () => import("./publish-spej40gd.js").then((m) => m.default),
-  lint: () => import("./lint-cwb6h2n5.js").then((m) => m.default),
-  validate: () => import("./validate-3ppsdngq.js").then((m) => m.default),
-  audit: () => import("./audit-9vv4ncjv.js").then((m) => m.default),
-  preflight: () => import("./preflight-maw8h45k.js").then((m) => m.default),
-  doctor: () => import("./doctor-k529b5et.js").then((m) => m.default),
-  ext: () => import("./ext-hbt1sdg5.js").then((m) => m.default)
+  new: () => import("./new-eec5qjn3.js").then((m) => m.default),
+  preview: () => import("./preview-xc1s2rqk.js").then((m) => m.default),
+  build: () => import("./build-10mm2y0f.js").then((m) => m.default),
+  publish: () => import("./publish-hzc8rqrb.js").then((m) => m.default),
+  lint: () => import("./lint-a56dykwv.js").then((m) => m.default),
+  validate: () => import("./validate-6y7rwsn5.js").then((m) => m.default),
+  audit: () => import("./audit-80kd4rsz.js").then((m) => m.default),
+  preflight: () => import("./preflight-jyqz8bzg.js").then((m) => m.default),
+  doctor: () => import("./doctor-mv6tm97r.js").then((m) => m.default),
+  ext: () => import("./ext-nvtgb652.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-sja9wn5c.js");
+      const { newArgs } = await import("./new-eec5qjn3.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-maw8h45k.js");
+      const { preflightArgs } = await import("./preflight-jyqz8bzg.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-hbt1sdg5.js");
+      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-nvtgb652.js");
       if (!EXT_SUBCOMMANDS.includes(subcommand)) {
         throw new UsageError(`gutterpress ext: unknown command "${subcommand}"`);
       }

package/dist/{doctor-k529b5et.js → doctor-mv6tm97r.js}

@@ -1,12 +1,12 @@
 import {
   getSystemDiagnostics,
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-c41yr7he.js";
 import"./cli-46ycxe6r.js";
 import"./cli-37x76zdn.js";

package/dist/{ext-hbt1sdg5.js → ext-nvtgb652.js}

@@ -10,15 +10,15 @@ import {
   removeExtension,
   searchNpmExtensions,
   setExtensionEnabled
-} from "./cli-cwv73tkx.js";
-import"./cli-y4vrycpn.js";
+} from "./cli-ff1kqhyv.js";
+import"./cli-ypha0473.js";
 import {
   UsageError,
   exitForUsage,
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolveProjectDir
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{index-qmvmvetj.js → index-x6qvmp60.js}

@@ -4874,7 +4874,7 @@ import git from "isomorphic-git";
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.1",
+  version: "0.11.3",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",
@@ -9539,6 +9539,21 @@ async function externalWatchRoots(targets) {
   }
   return [...roots];
 }
+async function extensionFolderFiles(dir) {
+  try {
+    if (!(await fsp3.stat(dir)).isDirectory())
+      return [];
+  } catch {
+    return [];
+  }
+  const meta = await readExtensionMeta(dir);
+  const entry = extensionEntry(meta);
+  return [
+    path10.join(dir, EXTENSION_MANIFEST_FILENAME),
+    ...entry ? [path10.resolve(dir, entry)] : [],
+    ...await collectStyleDependencies(dir, extensionStyleList(meta))
+  ];
+}
 async function externalWatchTargets(projectDir, config) {
   const root = path10.resolve(projectDir);
   let canonicalRoot = root;
@@ -9546,9 +9561,11 @@ async function externalWatchTargets(projectDir, config) {
     canonicalRoot = await fsp3.realpath(root);
   } catch {}
   const styles = await resolveActiveStyles(root, config.styles);
+  const extensionPaths = (config.extensions ?? []).map((p) => p.path).filter((p) => !!p).map((p) => path10.resolve(root, p));
   const candidates = [
     ...await collectStyleDependencies(root, styles),
-    ...(config.extensions ?? []).map((p) => p.path).filter((p) => !!p).map((p) => path10.resolve(root, p))
+    ...extensionPaths,
+    ...(await Promise.all(extensionPaths.map(extensionFolderFiles))).flat()
   ];
   const external = new Set;
   for (const abs of candidates) {
@@ -14868,7 +14885,6 @@ async function convergeMerge(params) {
   });
   const ourTip = await git5.resolveRef({ fs: gitFs, dir, ref: branch });
   const combined = new Set;
-  const driverBinary = new Set;
   const keptBothFiles = [];
   let tipBeforeMerge = ourTip;
   const attempt = async () => {
@@ -14885,7 +14901,6 @@ async function convergeMerge(params) {
       mergeDriver: ({ contents, path: filepath }) => {
         const [base, ours, theirsContent] = contents;
         if (MARKER_UNSAFE_EXT.test(filepath) || stringLooksBinary(ours) || stringLooksBinary(theirsContent) || stringLooksBinary(base)) {
-          driverBinary.add(filepath);
           return { cleanMerge: false, mergedText: ours };
         }
         combined.add(filepath);
@@ -14933,7 +14948,7 @@ async function convergeMerge(params) {
   } catch (e) {
     if (isMergeConflictError(e)) {
       await equalize({
-        binary: (e.data.bothModified ?? []).filter((p) => driverBinary.has(p)),
+        binary: e.data.bothModified ?? [],
         deleteByUs: e.data.deleteByUs ?? [],
         deleteByTheirs: e.data.deleteByTheirs ?? []
       });
@@ -15128,8 +15143,14 @@ async function syncProject(options) {
             ...onAuthFor(transport.credential)
           });
         } catch (e) {
-          if (!isPushRejected(e))
+          if (!isPushRejected(e)) {
+            const err = e;
+            logger.warn("sync", "push failed", {
+              code: err?.code ?? err?.name,
+              error: String(err?.message ?? e).replace(/\s+/g, " ").trim().replace(/\/\/[^/\s]*@/g, "//")
+            });
             throw e;
+          }
           logger.info("sync", `push rejected (non-fast-forward) — retrying`);
           if (attempt < attempts - 1 && backoffMs > 0)
             await sleep(backoffMs);

package/dist/index.js

@@ -143,7 +143,7 @@ import {
   syncProject,
   testRemoteAccess,
   validateProjectExtensions
-} from "./index-qmvmvetj.js";
+} from "./index-x6qvmp60.js";
 import {
   BUILD_DIAGNOSTIC_CODES
 } from "./index-12pvhbyz.js";

package/dist/{lint-cwb6h2n5.js → lint-a56dykwv.js}

@@ -1,15 +1,15 @@
 import {
   MANIFEST_FILENAMES,
   runLint
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{new-sja9wn5c.js → new-eec5qjn3.js}

@@ -7,15 +7,15 @@ import {
   TARGET_IDS,
   scaffoldExtension,
   scaffoldProject
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   resolveGhostscript
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import {
   isToolAvailable

package/dist/{preflight-maw8h45k.js → preflight-jyqz8bzg.js}

@@ -2,15 +2,15 @@ import {
   executeValidation,
   publishTargetFor,
   reportMissingTools
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/preview/file-watcher.d.ts

@@ -149,6 +149,10 @@ export declare function externalWatchRoots(targets: Iterable<string>): Promise<s
  * because a local stylesheet can reference a shared font just as easily — only
  * the results that land outside the book are added here.
  *
+ * An extension `path:` that names a FOLDER expands to the files the loader
+ * reads from it ({@link extensionFolderFiles}); the folder path on its own
+ * matches no file inside it.
+ *
  * Watching is per-FILE, never per-directory, so the set stays exact and cannot
  * accidentally pull a large sibling tree into the watcher.
  */

package/dist/{preview-vjwpj4tf.js → preview-xc1s2rqk.js}

@@ -6,10 +6,10 @@ import {
   runBuild,
   splitOutPath,
   startPreviewServer
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   parseFormat,
@@ -17,7 +17,7 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolvePort
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{publish-spej40gd.js → publish-hzc8rqrb.js}

@@ -11,16 +11,16 @@ import {
   publishProviderFor,
   resolvePublishFormat,
   runPublish
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   FileTokenStore,
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{validate-3ppsdngq.js → validate-6y7rwsn5.js}

@@ -1,14 +1,14 @@
 import {
   executeAndReport
-} from "./cli-cwv73tkx.js";
+} from "./cli-ff1kqhyv.js";
 import {
   log
-} from "./cli-y4vrycpn.js";
+} from "./cli-ypha0473.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-6gg8vwaj.js";
+} from "./cli-hby7qc6t.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/package.json

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