@dimm-city/print-md 0.5.0-rc.2 → 0.5.0-rc.4

package/dist/cli.js

@@ -758,6 +758,15 @@ var init_images = __esm(() => {
   PREFIX_PATTERNS = [/^(?:\.\/|\/)?temp\/images\//, /^(?:\.\/|\/)?images\//];
 });
 
+// ../lib/src/lib/markdown/chapter-id.ts
+function canonicalChapterId(p) {
+  let s = String(p).replace(/\\/g, "/");
+  s = s.replace(/\/{2,}/g, "/");
+  while (s.startsWith("./"))
+    s = s.slice(2);
+  return s;
+}
+
 // ../lib/src/lib/markdown/plugins.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { resolve as resolve2, join } from "node:path";
@@ -911,12 +920,13 @@ async function renderChapters(inputDir, opts = {}) {
   }
   let bodyContent = "";
   for (const file of files) {
-    const filePath = join2(inputDir, file);
+    const chapterId = canonicalChapterId(file);
+    const filePath = join2(inputDir, chapterId);
     try {
       const content = await readFile2(filePath, "utf-8");
       const rendered = md.render(content);
       if (opts.wrapChapters) {
-        const safe = String(file).replace(/&/g, "&").replace(/"/g, """);
+        const safe = chapterId.replace(/&/g, "&").replace(/"/g, """);
         bodyContent += `<div class="pmd-chapter" data-chapter-src="${safe}">
 ${rendered}
 </div>
@@ -22693,7 +22703,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@dimm-city/print-md-lib",
-    version: "0.5.0-rc.2",
+    version: "0.5.0-rc.4",
     private: true,
     type: "module",
     main: "dist/index.js",
@@ -22950,7 +22960,7 @@ var pagedjs_bridge_default = "./pagedjs-bridge-k1a8jxtv.js";
 var init_pagedjs_bridge = () => {};
 
 // ../lib/src/assets/preview/scripts/preview-shell.js
-var preview_shell_default = "./preview-shell-d3y4np7a.js";
+var preview_shell_default = "./preview-shell-fx145xzs.js";
 var init_preview_shell = () => {};
 
 // ../lib/src/assets/vendor/paged.polyfill.js
@@ -93686,7 +93696,7 @@ function createFileWatcher(state) {
       await generateAndWriteHtml(state.currentInputPath, state.tempDir, updatedConfig);
       const only = dests.length === 1 ? dests[0] : null;
       if (incrementalPreviewEnabled() && changes.length === 1 && only && only.ext === ".md" && only.event !== "unlink" && only.event !== "unlinkDir") {
-        state.previewServer?.broadcastContentUpdate(only.relativePath);
+        state.previewServer?.broadcastContentUpdate(canonicalChapterId(only.relativePath));
         info(`Chapter updated: ${only.relativePath}`);
       } else {
         state.previewServer?.broadcastReload();
@@ -94477,16 +94487,7 @@ async function findEnclosingRepoDir(folderPath) {
   }
   return;
 }
-async function detectProjectSource(folderPath) {
-  const gitDir = path9.join(folderPath, ".git");
-  if (!await isDirectory2(gitDir)) {
-    const enclosingRepoDir = await findEnclosingRepoDir(folderPath);
-    return {
-      type: "local-folder",
-      path: folderPath,
-      ...enclosingRepoDir !== undefined ? { enclosingRepoDir } : {}
-    };
-  }
+async function readGitDirInfo(gitDir) {
   let remoteUrl;
   try {
     const configText = await readFile21(path9.join(gitDir, "config"), "utf8");
@@ -94501,13 +94502,40 @@ async function detectProjectSource(folderPath) {
   } catch {
     branch = undefined;
   }
-  return {
-    type: "local-git-folder",
-    path: folderPath,
-    hasRemote: remoteUrl !== undefined,
-    ...remoteUrl !== undefined ? { remoteUrl } : {},
-    ...branch !== undefined ? { branch } : {}
-  };
+  return { remoteUrl, branch };
+}
+function repoSubPath(repoRoot, folderPath) {
+  const rel = path9.relative(path9.resolve(repoRoot), path9.resolve(folderPath));
+  return rel.split(path9.sep).join("/");
+}
+async function detectProjectSource(folderPath) {
+  const ownGitDir = path9.join(folderPath, ".git");
+  if (await isDirectory2(ownGitDir)) {
+    const { remoteUrl, branch } = await readGitDirInfo(ownGitDir);
+    return {
+      type: "local-git-folder",
+      path: folderPath,
+      repoRoot: folderPath,
+      subPath: "",
+      hasRemote: remoteUrl !== undefined,
+      ...remoteUrl !== undefined ? { remoteUrl } : {},
+      ...branch !== undefined ? { branch } : {}
+    };
+  }
+  const enclosingRepoDir = await findEnclosingRepoDir(folderPath);
+  if (enclosingRepoDir !== undefined) {
+    const { remoteUrl, branch } = await readGitDirInfo(path9.join(enclosingRepoDir, ".git"));
+    return {
+      type: "local-git-folder",
+      path: folderPath,
+      repoRoot: enclosingRepoDir,
+      subPath: repoSubPath(enclosingRepoDir, folderPath),
+      hasRemote: remoteUrl !== undefined,
+      ...remoteUrl !== undefined ? { remoteUrl } : {},
+      ...branch !== undefined ? { branch } : {}
+    };
+  }
+  return { type: "local-folder", path: folderPath };
 }
 function capabilitiesFor(source) {
   switch (source.type) {
@@ -94515,11 +94543,10 @@ function capabilitiesFor(source) {
       return {
         canRead: true,
         canWriteLocal: true,
-        canEnableVersionHistory: source.enclosingRepoDir === undefined,
+        canEnableVersionHistory: true,
         canSnapshot: false,
         canViewHistory: false,
         canRestoreSnapshot: false,
-        canPublish: false,
         canSync: false,
         authManagedByApp: false
       };
@@ -94531,7 +94558,6 @@ function capabilitiesFor(source) {
         canSnapshot: true,
         canViewHistory: true,
         canRestoreSnapshot: true,
-        canPublish: source.hasRemote,
         canSync: source.hasRemote,
         authManagedByApp: false
       };
@@ -94543,7 +94569,6 @@ function capabilitiesFor(source) {
         canSnapshot: true,
         canViewHistory: true,
         canRestoreSnapshot: true,
-        canPublish: true,
         canSync: true,
         authManagedByApp: true
       };
@@ -107734,6 +107759,7 @@ __export(exports_source_provider, {
   isNoChangesError: () => isNoChangesError,
   isGitInternalPath: () => isGitInternalPath,
   hasPendingChanges: () => hasPendingChanges,
+  gitScopeFor: () => gitScopeFor,
   gitDirFor: () => gitDirFor,
   gitAuthor: () => gitAuthor,
   autoSnapshotDelayMs: () => autoSnapshotDelayMs,
@@ -107745,6 +107771,9 @@ __export(exports_source_provider, {
 });
 import * as fs5 from "node:fs";
 import path10 from "node:path";
+function gitScopeFor(source) {
+  return { dir: source.repoRoot || source.path, subPath: source.subPath || "" };
+}
 function withRepoLock(projectDir, fn2) {
   const key = path10.resolve(projectDir);
   const prev = repoQueues.get(key) ?? Promise.resolve();
@@ -107758,12 +107787,20 @@ function gitAuthor(name) {
   const n = (name ?? "").trim();
   return { name: n || DEFAULT_AUTHOR, email: DEFAULT_EMAIL };
 }
-async function stageAll(dir) {
-  const status = await import_isomorphic_git.default.statusMatrix({ fs: fs5, dir });
+async function stageAll(dir, subPath) {
+  const status = await import_isomorphic_git.default.statusMatrix({
+    fs: fs5,
+    dir,
+    ...subPath ? { filepaths: [subPath] } : {}
+  });
   await Promise.all(status.map(([filepath, , worktreeStatus]) => worktreeStatus === 0 ? import_isomorphic_git.default.remove({ fs: fs5, dir, filepath }) : import_isomorphic_git.default.add({ fs: fs5, dir, filepath })));
 }
-async function hasPendingChanges(dir) {
-  const status = await import_isomorphic_git.default.statusMatrix({ fs: fs5, dir });
+async function hasPendingChanges(dir, subPath) {
+  const status = await import_isomorphic_git.default.statusMatrix({
+    fs: fs5,
+    dir,
+    ...subPath ? { filepaths: [subPath] } : {}
+  });
   return status.some(([, head, worktree, stage]) => !(head === 1 && worktree === 1 && stage === 1));
 }
 
@@ -107774,11 +107811,11 @@ class LocalFolderSourceProvider {
     this.source = source;
     this.capabilities = capabilitiesFor(source);
   }
-  initVersionHistory(options) {
-    if (this.source.type === "local-folder" && this.source.enclosingRepoDir !== undefined) {
-      return Promise.reject(new Error("This folder is already inside a versioned project, so print-md " + "won't create a separate history here."));
-    }
+  async initVersionHistory(options) {
     const dir = options.projectDir;
+    if (await findEnclosingRepoDir(dir) !== undefined) {
+      throw new Error("This folder is already inside a versioned project, so print-md " + "won't create a separate history here.");
+    }
     return withRepoLock(dir, async () => {
       await import_isomorphic_git.default.init({ fs: fs5, dir, defaultBranch: DEFAULT_BRANCH });
       await stageAll(dir);
@@ -107791,6 +107828,8 @@ class LocalFolderSourceProvider {
       return {
         type: "local-git-folder",
         path: dir,
+        repoRoot: dir,
+        subPath: "",
         hasRemote: false,
         branch: DEFAULT_BRANCH
       };
@@ -107810,9 +107849,11 @@ class LocalFolderSourceProvider {
 class LocalGitSourceProvider {
   source;
   capabilities;
+  scope;
   constructor(source) {
     this.source = source;
     this.capabilities = capabilitiesFor(source);
+    this.scope = gitScopeFor(source);
   }
   async initVersionHistory(options) {
     try {
@@ -107828,14 +107869,23 @@ class LocalGitSourceProvider {
     return this.source;
   }
   snapshot(options) {
-    return withRepoLock(options.projectDir, () => this.snapshotUnlocked(options));
+    return withRepoLock(this.scope.dir, () => this.snapshotUnlocked(options));
   }
   snapshotUnlocked(options) {
-    return snapshotWorkingTreeUnlocked(options);
+    return snapshotWorkingTreeUnlocked({
+      ...options,
+      repoRoot: this.scope.dir,
+      ...this.scope.subPath ? { subPath: this.scope.subPath } : {}
+    });
   }
-  listHistory(projectDir) {
-    return withRepoLock(projectDir, async () => {
-      const commits = await import_isomorphic_git.default.log({ fs: fs5, dir: projectDir });
+  listHistory(_projectDir) {
+    const { dir, subPath } = this.scope;
+    return withRepoLock(dir, async () => {
+      const commits = await import_isomorphic_git.default.log({
+        fs: fs5,
+        dir,
+        ...subPath ? { filepath: subPath, force: true } : {}
+      });
       return commits.map((c) => ({
         id: c.oid,
         message: c.commit.message.trim(),
@@ -107845,24 +107895,27 @@ class LocalGitSourceProvider {
     });
   }
   restore(options) {
-    return withRepoLock(options.projectDir, () => this.restoreUnlocked(options));
+    return withRepoLock(this.scope.dir, () => this.restoreUnlocked(options));
   }
   async restoreUnlocked(options) {
+    const { dir, subPath } = this.scope;
     await import_isomorphic_git.default.checkout({
       fs: fs5,
-      dir: options.projectDir,
+      dir,
       ref: options.id,
       force: true,
-      noUpdateHead: true
+      noUpdateHead: true,
+      ...subPath ? { filepaths: [subPath] } : {}
     });
   }
 }
 async function snapshotWorkingTreeUnlocked(options) {
-  const dir = options.projectDir;
-  if (!await hasPendingChanges(dir)) {
+  const dir = options.repoRoot ?? options.projectDir;
+  const subPath = options.subPath || undefined;
+  if (!await hasPendingChanges(dir, subPath)) {
     throw new Error("No changes since the last snapshot — there is nothing new to save.");
   }
-  await stageAll(dir);
+  await stageAll(dir, subPath);
   const author = gitAuthor(options.authorName);
   const id2 = await import_isomorphic_git.default.commit({
     fs: fs5,
@@ -107913,9 +107966,10 @@ async function restoreVersionWithBackup(options) {
     throw new Error("This project has no version history yet. Enable version history first.");
   }
   const provider = new LocalGitSourceProvider(source);
-  return withRepoLock(projectDir, async () => {
+  const scope = gitScopeFor(source);
+  return withRepoLock(scope.dir, async () => {
     let backupId;
-    if (await hasPendingChanges(projectDir)) {
+    if (await hasPendingChanges(scope.dir, scope.subPath || undefined)) {
       const backup = await provider.snapshotUnlocked({
         projectDir,
         message: RESTORE_BACKUP_MESSAGE,
@@ -108156,9 +108210,10 @@ var init_diagnose = __esm(() => {
   init_token_store();
 });
 
-// ../lib/src/lib/remote-auth/publish.ts
+// ../lib/src/lib/remote-auth/sync.ts
 var import_diff3;
-var init_publish = __esm(() => {
+var init_sync = __esm(() => {
+  init_project_source();
   init_source_provider();
   init_token_store();
   import_diff3 = __toESM(require_diff3(), 1);
@@ -108179,7 +108234,7 @@ var init_api = __esm(() => {
   init_test_access();
   init_generic_auth();
   init_diagnose();
-  init_publish();
+  init_sync();
 });
 
 // ../lib/src/index.ts
@@ -108840,7 +108895,7 @@ var SUBCOMMANDS = {
   audit: () => Promise.resolve().then(() => (init_audit(), exports_audit)).then((m) => m.default),
   preflight: () => Promise.resolve().then(() => (init_preflight(), exports_preflight)).then((m) => m.default)
 };
-var VERSION = "0.5.0-rc.2";
+var VERSION = "0.5.0-rc.4";
 var main = defineCommand8({
   meta: {
     name: "print-md",

package/dist/{preview-shell-d3y4np7a.js → preview-shell-fx145xzs.js}

@@ -102,6 +102,43 @@
     return v ? v.split('\n') : [];
   }
 
+  // Canonical chapter id (inline copy of lib/markdown/chapter-id.ts — this
+  // file is plain embedded JS and cannot import the lib): forward slashes,
+  // no './' prefix, no duplicate slashes.
+  function normId(s) {
+    s = String(s || '').replace(/\\/g, '/').replace(/\/{2,}/g, '/');
+    while (s.indexOf('./') === 0) s = s.slice(2);
+    return s;
+  }
+
+  // Every distinct chapter id present in the live view's page tags.
+  function liveChapterIds(d) {
+    var pages = d.querySelectorAll('.pagedjs_page'), ids = [], i, j;
+    for (i = 0; i < pages.length; i++) {
+      var list = pageChapters(pages[i]);
+      for (j = 0; j < list.length; j++) if (ids.indexOf(list[j]) === -1) ids.push(list[j]);
+    }
+    return ids;
+  }
+
+  // Resolve a broadcast chapter id to the tag string actually used in the
+  // live view. Exact match first (the normal, canonical-everywhere case);
+  // then normalized match, then unique-basename match — defensive layers for
+  // a stale book.html tagged by an older build. Returns null when the chapter
+  // genuinely isn't in the live view (new file, or layout we can't resolve).
+  function resolveChapterId(d, file) {
+    var ids = liveChapterIds(d), i;
+    if (ids.indexOf(file) !== -1) return file;
+    var want = normId(file), hits = [];
+    for (i = 0; i < ids.length; i++) if (normId(ids[i]) === want) hits.push(ids[i]);
+    if (hits.length === 1) return hits[0];
+    if (!hits.length) {
+      var base = want.split('/').pop();
+      for (i = 0; i < ids.length; i++) if (normId(ids[i]).split('/').pop() === base) hits.push(ids[i]);
+    }
+    return hits.length === 1 ? hits[0] : null;
+  }
+
   // Collect the live pages a chapter appears on: `owned` = every page that
   // contains any of it (document order); `shared` = the subset it shares with
   // another chapter (chapter starts or ends mid-page).
@@ -158,6 +195,20 @@
   function spliceChapter(file) {
     var anchor = capture(active);
     tagPages(active);
+    // Presence check BEFORE rendering: if the chapter can't be located in the
+    // live view, the splice can never succeed — go straight to the full swap
+    // instead of paying a wasted single-chapter render first. The log carries
+    // both sides of the identity so any future mismatch is self-diagnosing.
+    var ad0 = fdoc(active);
+    var liveId = ad0 ? resolveChapterId(ad0, file) : null;
+    if (!liveId) {
+      var ids = ad0 ? liveChapterIds(ad0) : [];
+      var detail = 'broadcast "' + file + '" matched no live data-chapter-src tag (new file?); live tags: [' + ids.join(', ') + ']';
+      if (window.console) console.warn('[pmd] incremental splice skipped, full swap: ' + detail);
+      logToServer('splice skipped (full swap) for ' + file + ': ' + detail);
+      swap();
+      return;
+    }
     var f = document.createElement('iframe'); f.style.visibility = 'hidden'; f.setAttribute('aria-hidden', 'true');
     f.src = '/__chapter?file=' + encodeURIComponent(file) + '&t=' + Date.now();
     f.addEventListener('load', function () {
@@ -165,7 +216,7 @@
         try {
           var ad = fdoc(active), sd = fdoc(f);
           var container = ad.querySelector('.pagedjs_pages') || ad.body;
-          var found = pagesFor(ad, file);
+          var found = pagesFor(ad, liveId);
           var newPages = [].slice.call(sd.querySelectorAll('.pagedjs_page'));
           if (!newPages.length) throw new Error('chapter render produced no pages');
           if (!found.owned.length) throw new Error('chapter not present in live view (new file?)');
@@ -198,9 +249,9 @@
             for (i = 0; i < found.shared.length; i++) {
               var frags = found.shared[i].querySelectorAll('.pmd-chapter[data-chapter-src]');
               for (j = 0; j < frags.length; j++) {
-                if (frags[j].getAttribute('data-chapter-src') === file) frags[j].parentNode.removeChild(frags[j]);
+                if (frags[j].getAttribute('data-chapter-src') === liveId) frags[j].parentNode.removeChild(frags[j]);
               }
-              var rest = pageChapters(found.shared[i]).filter(function (c) { return c !== file; });
+              var rest = pageChapters(found.shared[i]).filter(function (c) { return c !== liveId; });
               found.shared[i].setAttribute('data-chapter-srcs', rest.join('\n'));
               if (rest.length) found.shared[i].setAttribute('data-chapter-src', rest[0]);
               else found.shared[i].removeAttribute('data-chapter-src');
@@ -209,8 +260,8 @@
 
           for (i = 0; i < newPages.length; i++) {
             var imp = ad.importNode(newPages[i], true);
-            imp.setAttribute('data-chapter-src', file);
-            imp.setAttribute('data-chapter-srcs', file);
+            imp.setAttribute('data-chapter-src', liveId);
+            imp.setAttribute('data-chapter-srcs', liveId);
             container.insertBefore(imp, at);
           }
           for (j = 0; j < exclusive.length; j++) exclusive[j].parentNode.removeChild(exclusive[j]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dimm-city/print-md",
-  "version": "0.5.0-rc.2",
+  "version": "0.5.0-rc.4",
   "description": "Markdown-to-PDF converter for professional print layout using Paged.js and Ghostscript.",
   "author": "itlackey",
   "license": "MPL-2.0",