@aspruyt/xfg 3.5.2 → 3.5.4

package/dist/ruleset-diff.d.ts

@@ -8,6 +8,12 @@ export interface RulesetChange {
     current?: GitHubRuleset;
     desired?: Ruleset;
 }
+/**
+ * Normalizes any ruleset object (GitHub API or config) for comparison.
+ * Converts all keys to snake_case, filters to comparable fields only,
+ * and recursively normalizes values.
+ */
+export declare function normalizeRuleset(obj: GitHubRuleset | Ruleset): Record<string, unknown>;
 /**
  * Projects `current` onto the shape of `desired`.
  * Only keeps keys/structure present in `desired`, filtering out API noise.

package/dist/ruleset-diff.js

@@ -30,15 +30,21 @@ function normalizeValue(value) {
     return value;
 }
 /**
- * Normalizes a GitHub ruleset for comparison.
+ * Normalizes any ruleset object (GitHub API or config) for comparison.
+ * Converts all keys to snake_case, filters to comparable fields only,
+ * and recursively normalizes values.
  */
-function normalizeGitHubRuleset(ruleset) {
+export function normalizeRuleset(obj) {
     const normalized = {};
-    for (const [key, value] of Object.entries(ruleset)) {
-        if (!RULESET_COMPARABLE_FIELDS.has(key) || value === undefined) {
+    for (const [key, value] of Object.entries(obj)) {
+        if (value === undefined) {
+            continue;
+        }
+        const snakeKey = camelToSnake(key);
+        if (!RULESET_COMPARABLE_FIELDS.has(snakeKey)) {
             continue;
         }
-        normalized[key] = normalizeValue(value);
+        normalized[snakeKey] = normalizeValue(value);
     }
     return normalized;
 }
@@ -51,15 +57,7 @@ function normalizeConfigRuleset(ruleset) {
         enforcement: ruleset.enforcement ?? "active",
         ...ruleset,
     };
-    const normalized = {};
-    for (const [key, value] of Object.entries(withDefaults)) {
-        if (value === undefined) {
-            continue;
-        }
-        const snakeKey = camelToSnake(key);
-        normalized[snakeKey] = normalizeValue(value);
-    }
-    return normalized;
+    return normalizeRuleset(withDefaults);
 }
 /**
  * Performs deep equality comparison of two normalized values.
@@ -198,7 +196,7 @@ export function diffRulesets(current, desired, managedNames) {
         }
         else {
             // Existing ruleset - check if changed
-            const normalizedCurrent = normalizeGitHubRuleset(currentRuleset);
+            const normalizedCurrent = normalizeRuleset(currentRuleset);
             const normalizedDesired = normalizeConfigRuleset(desiredRuleset);
             const projectedCurrent = projectToDesiredShape(normalizedCurrent, normalizedDesired);
             if (deepEqual(projectedCurrent, normalizedDesired)) {

package/dist/ruleset-plan-formatter.js

@@ -1,7 +1,6 @@
 // src/ruleset-plan-formatter.ts
 import chalk from "chalk";
-import { projectToDesiredShape, } from "./ruleset-diff.js";
-import { RULESET_COMPARABLE_FIELDS } from "./config.js";
+import { projectToDesiredShape, normalizeRuleset, } from "./ruleset-diff.js";
 // =============================================================================
 // Property Diff Algorithm
 // =============================================================================
@@ -352,37 +351,6 @@ export function formatPropertyTree(diffs) {
 // =============================================================================
 // Ruleset Plan Formatter
 // =============================================================================
-/**
- * Normalize a GitHubRuleset or Ruleset for comparison.
- * Converts to snake_case and removes metadata fields.
- */
-function normalizeForDiff(obj) {
-    const result = {};
-    for (const [key, value] of Object.entries(obj)) {
-        // Convert camelCase to snake_case for consistency
-        const snakeKey = key.replace(/([A-Z])/g, "_$1").toLowerCase();
-        if (!RULESET_COMPARABLE_FIELDS.has(snakeKey) || value === undefined)
-            continue;
-        result[snakeKey] = normalizeNestedValue(value);
-    }
-    return result;
-}
-function normalizeNestedValue(value) {
-    if (value === null || value === undefined)
-        return value;
-    if (Array.isArray(value))
-        return value.map(normalizeNestedValue);
-    if (typeof value === "object") {
-        const obj = value;
-        const result = {};
-        for (const [key, val] of Object.entries(obj)) {
-            const snakeKey = key.replace(/([A-Z])/g, "_$1").toLowerCase();
-            result[snakeKey] = normalizeNestedValue(val);
-        }
-        return result;
-    }
-    return value;
-}
 /**
  * Format a full ruleset config as tree lines (for create action).
  */
@@ -467,8 +435,8 @@ export function formatRulesetPlan(changes) {
         for (const change of updateChanges) {
             lines.push(chalk.yellow(`    ~ ruleset "${change.name}"`));
             if (change.current && change.desired) {
-                const currentNorm = normalizeForDiff(change.current);
-                const desiredNorm = normalizeForDiff(change.desired);
+                const currentNorm = normalizeRuleset(change.current);
+                const desiredNorm = normalizeRuleset(change.desired);
                 const projectedCurrent = projectToDesiredShape(currentNorm, desiredNorm);
                 const diffs = computePropertyDiffs(projectedCurrent, desiredNorm);
                 const treeLines = formatPropertyTree(diffs);

package/dist/ruleset-processor.js

@@ -1,5 +1,5 @@
 import { isGitHubRepo, getRepoDisplayName } from "./repo-detector.js";
-import { GitHubRulesetStrategy } from "./strategies/github-ruleset-strategy.js";
+import { GitHubRulesetStrategy, } from "./strategies/github-ruleset-strategy.js";
 import { diffRulesets } from "./ruleset-diff.js";
 import { formatRulesetPlan, } from "./ruleset-plan-formatter.js";
 // =============================================================================
@@ -49,8 +49,21 @@ export class RulesetProcessor {
             const currentRulesets = await this.strategy.list(githubRepo, strategyOptions);
             // Convert desired rulesets to Map
             const desiredMap = new Map(Object.entries(desiredRulesets));
+            // Hydrate rulesets that match desired names with full details from get()
+            // The list endpoint only returns summary fields (id, name, target, enforcement)
+            // but not rules, conditions, or bypass_actors needed for accurate diffing
+            const fullRulesets = [];
+            for (const summary of currentRulesets) {
+                if (desiredMap.has(summary.name)) {
+                    const full = await this.strategy.get(githubRepo, summary.id, strategyOptions);
+                    fullRulesets.push(full);
+                }
+                else {
+                    fullRulesets.push(summary);
+                }
+            }
             // Compute diff
-            const changes = diffRulesets(currentRulesets, desiredMap, managedRulesets);
+            const changes = diffRulesets(fullRulesets, desiredMap, managedRulesets);
             // Count changes by type
             const changeCounts = {
                 create: changes.filter((c) => c.action === "create").length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "description": "CLI tool for repository-as-code",
   "type": "module",
   "main": "dist/index.js",