@aspruyt/xfg 5.1.4 → 5.1.6

package/dist/output/settings-report.js

@@ -135,6 +135,8 @@ function formatValuePlain(val) {
         return `"${val}"`;
     if (typeof val === "boolean")
         return val ? "true" : "false";
+    if (typeof val === "object")
+        return JSON.stringify(val);
     return String(val);
 }
 function formatRulesetConfigPlain(config) {
@@ -145,6 +147,7 @@ function formatRulesetConfigPlain(config) {
  * Shared between formatSettingsReportMarkdown and unified-summary's renderSettingsLines.
  */
 export function renderRepoSettingsDiffLines(repo, diffLines) {
+    const startLength = diffLines.length;
     for (const setting of repo.settings) {
         if (setting.oldValue === undefined && setting.newValue === undefined) {
             continue;
@@ -156,7 +159,15 @@ export function renderRepoSettingsDiffLines(repo, diffLines) {
             diffLines.push(`! ${setting.name}: ${formatValuePlain(setting.oldValue)} → ${formatValuePlain(setting.newValue)}`);
         }
     }
-    for (const ruleset of repo.rulesets) {
+    // Blank line before rulesets if there was content above
+    if (repo.rulesets.length > 0 && diffLines.length > startLength) {
+        diffLines.push("");
+    }
+    for (let i = 0; i < repo.rulesets.length; i++) {
+        const ruleset = repo.rulesets[i];
+        // Blank line between rulesets
+        if (i > 0)
+            diffLines.push("");
         if (ruleset.action === "create") {
             diffLines.push(`+ ruleset "${ruleset.name}"`);
             if (ruleset.config) {
@@ -175,7 +186,9 @@ export function renderRepoSettingsDiffLines(repo, diffLines) {
                         diffLines.push(`!   ${path}: ${formatValuePlain(diff.oldValue)} → ${formatValuePlain(diff.newValue)}`);
                     }
                     else if (diff.action === "remove") {
-                        diffLines.push(`-   ${path}`);
+                        diffLines.push(diff.oldValue !== undefined
+                            ? `-   ${path}: ${formatValuePlain(diff.oldValue)}`
+                            : `-   ${path}`);
                     }
                 }
             }
@@ -184,6 +197,10 @@ export function renderRepoSettingsDiffLines(repo, diffLines) {
             diffLines.push(`- ruleset "${ruleset.name}"`);
         }
     }
+    // Blank line before labels if there was content above
+    if (repo.labels.length > 0 && diffLines.length > startLength) {
+        diffLines.push("");
+    }
     for (const label of repo.labels) {
         if (label.action === "create") {
             diffLines.push(`+ label "${label.name}"`);
@@ -234,8 +251,7 @@ export function formatSettingsReportMarkdown(report, dryRun) {
         lines.push("> This was a dry run — no changes were applied");
         lines.push("");
     }
-    // Diff block
-    const diffLines = [];
+    // Per-repo sections: heading + diff block
     for (const repo of report.repos) {
         if (repo.settings.length === 0 &&
             repo.rulesets.length === 0 &&
@@ -243,14 +259,16 @@ export function formatSettingsReportMarkdown(report, dryRun) {
             !repo.error) {
             continue;
         }
-        diffLines.push(`@@ ${repo.repoName} @@`);
-        renderRepoSettingsDiffLines(repo, diffLines);
-    }
-    if (diffLines.length > 0) {
-        lines.push("```diff");
-        lines.push(...diffLines);
-        lines.push("```");
+        lines.push(`### ${repo.repoName}`);
         lines.push("");
+        const diffLines = [];
+        renderRepoSettingsDiffLines(repo, diffLines);
+        if (diffLines.length > 0) {
+            lines.push("```diff");
+            lines.push(...diffLines);
+            lines.push("```");
+            lines.push("");
+        }
     }
     // Summary
     lines.push(`**${formatSettingsSummary(report.totals)}**`);

package/dist/output/sync-report.js

@@ -58,27 +58,32 @@ export function formatSyncReportMarkdown(report, dryRun) {
         lines.push("> This was a dry run — no changes were applied");
         lines.push("");
     }
-    // Diff block
-    const diffLines = [];
+    // Per-repo sections: heading + diff block
     for (const repo of report.repos) {
         if (repo.files.length === 0 && !repo.error) {
             continue;
         }
-        diffLines.push(`@@ ${repo.repoName} @@`);
-        renderSyncLines(repo, diffLines);
-    }
-    if (diffLines.length > 0) {
-        lines.push("```diff");
-        lines.push(...diffLines);
-        lines.push("```");
+        lines.push(`### ${repo.repoName}`);
         lines.push("");
+        const diffLines = [];
+        renderSyncLines(repo, diffLines);
+        if (diffLines.length > 0) {
+            lines.push("```diff");
+            lines.push(...diffLines);
+            lines.push("```");
+            lines.push("");
+        }
     }
     // Summary
     lines.push(`**${formatSyncSummary(report.totals)}**`);
     return lines.join("\n");
 }
 export function renderSyncLines(syncRepo, diffLines) {
-    for (const file of syncRepo.files) {
+    for (let i = 0; i < syncRepo.files.length; i++) {
+        const file = syncRepo.files[i];
+        // Blank line between files for readability
+        if (i > 0)
+            diffLines.push("");
         if (file.action === "create") {
             diffLines.push(`+ ${file.path}`);
         }

package/dist/output/unified-summary.js

@@ -165,8 +165,7 @@ export function formatUnifiedSummaryMarkdown(input) {
         addRepo(r.repoName);
     for (const r of input.settings?.repos ?? [])
         addRepo(r.repoName);
-    // Diff block
-    const diffLines = [];
+    // Per-repo sections: heading + diff block
     for (const repoName of allRepos) {
         const lcAction = lifecycleByRepo.get(repoName);
         const syncRepo = syncByRepo.get(repoName);
@@ -180,19 +179,27 @@ export function formatUnifiedSummaryMarkdown(input) {
                 settingsRepo.error);
         if (!hasLcChange && !hasSyncChanges && !hasSettingsChanges)
             continue;
-        diffLines.push(`@@ ${repoName} @@`);
+        lines.push(`### ${repoName}`);
+        lines.push("");
+        const diffLines = [];
         if (lcAction)
             renderLifecycleLines(lcAction, diffLines);
+        // Blank line between lifecycle and sync sections
+        if (hasLcChange && hasSyncChanges)
+            diffLines.push("");
         if (syncRepo)
             renderSyncLines(syncRepo, diffLines);
+        // Blank line between files and settings sections
+        if (hasSyncChanges && hasSettingsChanges)
+            diffLines.push("");
         if (settingsRepo)
             renderRepoSettingsDiffLines(settingsRepo, diffLines);
-    }
-    if (diffLines.length > 0) {
-        lines.push("```diff");
-        lines.push(...diffLines);
-        lines.push("```");
-        lines.push("");
+        if (diffLines.length > 0) {
+            lines.push("```diff");
+            lines.push(...diffLines);
+            lines.push("```");
+            lines.push("");
+        }
     }
     // Combined summary
     lines.push(`**${formatCombinedSummary(input)}**`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "description": "Manage files, settings, and repositories across GitHub, Azure DevOps, and GitLab — declaratively, from a single YAML config",
   "type": "module",
   "main": "dist/index.js",