@aspruyt/xfg 6.0.2 → 6.1.0

package/dist/config/formatter.js

@@ -42,6 +42,11 @@ function buildCommentOnlyYaml(header, schemaUrl) {
         return undefined;
     return lines.join("\n") + "\n";
 }
+function buildJson5HeaderComment(header) {
+    if (!header || header.length === 0)
+        return undefined;
+    return header.map((h) => `// ${h}`).join("\n") + "\n";
+}
 /**
  * Converts content to string in the appropriate format.
  * Handles null content (empty files), text content (string/string[]), and object content (JSON/YAML).
@@ -55,6 +60,12 @@ export function convertContentToString(content, fileName, options) {
                 return commentOnly;
             }
         }
+        if (format === "json5" && options) {
+            const commentOnly = buildJson5HeaderComment(options.header);
+            if (commentOnly) {
+                return commentOnly;
+            }
+        }
         return "";
     }
     if (typeof content === "string") {
@@ -94,6 +105,11 @@ export function convertContentToString(content, fileName, options) {
             defaultKeyType: "PLAIN",
         });
     }
-    // JSON and JSON5 — both use standard JSON.stringify (valid JSON5 superset)
+    if (format === "json5" && options) {
+        const headerComment = buildJson5HeaderComment(options.header);
+        if (headerComment) {
+            return headerComment + JSON.stringify(content, null, 2) + "\n";
+        }
+    }
     return JSON.stringify(content, null, 2) + "\n";
 }

package/dist/config/normalizer.js

@@ -485,6 +485,17 @@ export function normalizeConfig(raw, env) {
             effectiveSettings = merged.settings;
         }
         const fileNames = Object.keys(effectiveRootFiles);
+        // Collect repo-only file names (defined at repo level but not in root/groups)
+        const repoOnlyFileNames = [];
+        if (rawRepo.files) {
+            for (const name of Object.keys(rawRepo.files)) {
+                if (name === "inherit")
+                    continue;
+                if (!effectiveRootFiles[name]) {
+                    repoOnlyFileNames.push(name);
+                }
+            }
+        }
         for (const gitUrl of gitUrls) {
             const files = [];
             const inheritFiles = shouldInherit(rawRepo.files);
@@ -496,6 +507,15 @@ export function normalizeConfig(raw, env) {
                 if (entry)
                     files.push(entry);
             }
+            // Process repo-only files (standalone definitions not in root/groups)
+            for (const fileName of repoOnlyFileNames) {
+                const repoOverride = rawRepo.files[fileName];
+                if (repoOverride === false)
+                    continue;
+                const entry = resolveFileEntry(fileName, {}, repoOverride, true, raw.deleteOrphaned, env);
+                if (entry)
+                    files.push(entry);
+            }
             // Merge PR options: per-repo overrides effective (root + groups)
             const prOptions = mergePROptions(effectivePROptions, rawRepo.prOptions);
             // Merge settings: per-repo deep merges with effective (root + groups)

package/dist/config/validator.js

@@ -599,7 +599,17 @@ function validateRepoFiles(config, repo, index, repoLabel) {
             continue;
         }
         if (!knownFiles.has(fileName)) {
-            throw new ValidationError(`Repo at index ${index} references undefined file '${fileName}'. File must be defined in root 'files' object or in a referenced group.`);
+            const fileEntry = repo.files[fileName];
+            const isStandaloneDefinition = fileEntry != null &&
+                fileEntry !== false &&
+                typeof fileEntry === "object" &&
+                "content" in fileEntry &&
+                fileEntry.content !== undefined &&
+                fileEntry.content !== null;
+            if (!isStandaloneDefinition) {
+                throw new ValidationError(`Repo at index ${index} references undefined file '${fileName}'. File must be defined in root 'files' object or in a referenced group, or provide content inline.`);
+            }
+            validateFileName(fileName);
         }
         const fileOverride = repo.files[fileName];
         if (fileOverride === false) {

package/dist/settings/rulesets/diff.js

@@ -199,6 +199,11 @@ function matchByIndex(current, desired) {
     for (let i = 0; i < Math.min(current.length, desired.length); i++) {
         result.push(projectToDesiredShape(current[i], desired[i]));
     }
+    // Append extra current items so deepEqual detects length mismatch (removals).
+    // Mirrors matchByKey behavior added for #549.
+    for (let i = desired.length; i < current.length; i++) {
+        result.push(current[i]);
+    }
     return result;
 }
 /**

package/package.json

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