@davmash/bygone 0.7.1 → 0.8.3

package/out/changeTour.js

@@ -1515,7 +1515,11 @@ function applySource(source, defaultScenes, repoRoot) {
         continue;
       }
       if (authoredScene.kind === "stacked-diff") {
-        const stackedScene = buildStackedScene(repoRoot, authoredScene);
+        const stackedScene = buildStackedScene(
+          repoRoot,
+          authoredScene,
+          [...available.keys()]
+        );
         scenes.push(stackedScene);
         sceneIds.push(stackedScene.id);
         continue;
@@ -1623,8 +1627,7 @@ function buildDeconstructedManifestScene(repoRoot, source, baseRef, targetRef) {
     }))
   };
 }
-function buildStackedScene(repoRoot, source) {
-  var _a;
+function buildStackedScene(repoRoot, source, availableFilePaths) {
   const stack = source.stack.map((entry) => ({
     id: entry.id,
     ref: entry.ref,
@@ -1644,15 +1647,18 @@ function buildStackedScene(repoRoot, source) {
     maxBuffer: 16 * 1024 * 1024,
     stdio: ["ignore", "pipe", "pipe"]
   })));
-  const renamedPreviousPaths = new Set(adjacentChanges.flatMap((changes) => changes.map((change) => change.previousPath).filter((candidate) => Boolean(candidate))));
-  const changedFiles = [...new Set(adjacentChanges.flatMap((changes) => changes.map((change) => change.path)))].filter((filePath) => !renamedPreviousPaths.has(filePath)).sort();
-  const filePaths = ((_a = source.files) == null ? void 0 : _a.length) ? [...new Set(source.files)] : changedFiles;
-  for (const step of source.steps) {
-    if (!filePaths.includes(step.file)) throw new Error(`Stacked step ${step.id} references undeclared file ${step.file}.`);
-  }
+  const filePaths = [.../* @__PURE__ */ new Set([
+    ...availableFilePaths,
+    ...source.files || [],
+    ...source.steps.map((step) => step.file)
+  ])].sort();
   if (filePaths.length === 0) throw new Error(`Stacked scene ${source.id} has no changed files.`);
+  const requiredFilePaths = /* @__PURE__ */ new Set([
+    ...source.files || [],
+    ...source.steps.map((step) => step.file)
+  ]);
   let totalContentBytes = 0;
-  const files = filePaths.map((filePath) => {
+  const files = filePaths.flatMap((filePath) => {
     const aliases = /* @__PURE__ */ new Set([filePath]);
     for (const changes of adjacentChanges) {
       for (const change of changes) {
@@ -1662,26 +1668,35 @@ function buildStackedScene(repoRoot, source) {
         }
       }
     }
-    const panels = stack.map((entry) => {
+    let fileContentBytes = 0;
+    const panels = [];
+    for (const entry of stack) {
       const resolvedPath = [...aliases].find((candidate) => gitBlobExists(repoRoot, entry.oid, candidate));
       if (!resolvedPath) {
-        return { id: entry.id, label: `${entry.label} / ${filePath} (missing)`, content: "", exists: false };
+        panels.push({ id: entry.id, label: `${entry.label} / ${filePath} (missing)`, content: "", exists: false });
+        continue;
       }
       const content = readGitText2(repoRoot, entry.oid, resolvedPath, DEFAULT_MAX_TOUR_FILE_BYTES, DEFAULT_MAX_TOUR_LINE_BYTES);
-      if (content.kind !== "text") throw new Error(`Stacked tour file is binary or too large: ${resolvedPath}`);
-      totalContentBytes += Buffer.byteLength(content.content);
-      if (totalContentBytes > DEFAULT_MAX_STACK_CONTENT_BYTES) {
-        throw new Error(`Stacked tour content exceeds ${DEFAULT_MAX_STACK_CONTENT_BYTES} bytes.`);
+      if (content.kind !== "text") {
+        if (requiredFilePaths.has(filePath)) {
+          throw new Error(`Stacked tour file is binary or too large: ${resolvedPath}`);
+        }
+        return [];
       }
-      return {
+      fileContentBytes += Buffer.byteLength(content.content);
+      panels.push({
         id: entry.id,
         label: `${entry.label} / ${resolvedPath}`,
         path: resolvedPath,
         content: content.content,
         exists: true
-      };
-    });
-    return { path: filePath, panels };
+      });
+    }
+    totalContentBytes += fileContentBytes;
+    if (totalContentBytes > DEFAULT_MAX_STACK_CONTENT_BYTES) {
+      throw new Error(`Stacked tour content exceeds ${DEFAULT_MAX_STACK_CONTENT_BYTES} bytes.`);
+    }
+    return [{ path: filePath, panels }];
   });
   const stackIds = stack.map((entry) => entry.id);
   return {
@@ -1695,7 +1710,7 @@ function buildStackedScene(repoRoot, source) {
     stack,
     files,
     steps: source.steps.map((step) => {
-      var _a2, _b;
+      var _a, _b;
       return {
         id: step.id,
         title: step.title,
@@ -1703,7 +1718,7 @@ function buildStackedScene(repoRoot, source) {
         file: step.file,
         pairIndex: stackIds.indexOf(step.pair[0]),
         side: step.side || "right",
-        startLine: (_a2 = step.lines) == null ? void 0 : _a2[0],
+        startLine: (_a = step.lines) == null ? void 0 : _a[0],
         endLine: (_b = step.lines) == null ? void 0 : _b[1]
       };
     })