@aspruyt/xfg 6.3.0 → 6.4.1

package/PR.md

@@ -8,6 +8,6 @@ Automated sync of configuration files to ${xfg:repo.fullName}.
 
 ${xfg:pr.fileChanges}
 
----
+______________________________________________________________________
 
 _This PR was automatically generated by [xfg](https://github.com/anthony-spruyt/xfg)_

package/README.md

@@ -1,13 +1,8 @@
 # xfg
 
-[![CI](https://github.com/anthony-spruyt/xfg/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/anthony-spruyt/xfg/actions/workflows/ci.yaml)
-[![codecov](https://codecov.io/gh/anthony-spruyt/xfg/graph/badge.svg)](https://codecov.io/gh/anthony-spruyt/xfg)
-[![Socket Badge](https://badge.socket.dev/npm/package/@aspruyt/xfg)](https://socket.dev/npm/package/@aspruyt/xfg)
-[![npm version](https://img.shields.io/npm/v/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/xfg)
-[![npm downloads](https://img.shields.io/npm/dw/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/xfg)
-[![GitHub Marketplace](https://img.shields.io/badge/Marketplace-xfg-blue?logo=github)](https://github.com/marketplace/actions/xfg-repo-as-code)
-[![docs](https://img.shields.io/badge/docs-GitHub%20Pages-blue)](https://anthony-spruyt.github.io/xfg/)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
+[![CI](https://github.com/anthony-spruyt/xfg/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/anthony-spruyt/xfg/actions/workflows/ci.yaml) [![codecov](https://codecov.io/gh/anthony-spruyt/xfg/graph/badge.svg)](https://codecov.io/gh/anthony-spruyt/xfg) [![Socket Badge](https://badge.socket.dev/npm/package/@aspruyt/xfg)](https://socket.dev/npm/package/@aspruyt/xfg)
+[![npm version](https://img.shields.io/npm/v/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/xfg) [![npm downloads](https://img.shields.io/npm/dw/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/xfg) [![GitHub Marketplace](https://img.shields.io/badge/Marketplace-xfg-blue?logo=github)](https://github.com/marketplace/actions/xfg-repo-as-code)
+[![docs](https://img.shields.io/badge/docs-GitHub%20Pages-blue)](https://anthony-spruyt.github.io/xfg/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
 Manage files, settings, and repositories across GitHub, Azure DevOps, and GitLab — declaratively, from a single YAML config.
 

package/dist/cli/branch-utils.d.ts

@@ -1,6 +1,2 @@
+export { validateBranchName } from "../shared/branch-validation.js";
 export declare function sanitizeBranchName(fileName: string): string;
-/**
- * Validates a user-provided branch name against git's naming rules.
- * @throws ValidationError if the branch name is invalid
- */
-export declare function validateBranchName(branchName: string): void;

package/dist/cli/branch-utils.js

@@ -1,4 +1,4 @@
-import { ValidationError } from "../shared/errors.js";
+export { validateBranchName } from "../shared/branch-validation.js";
 export function sanitizeBranchName(fileName) {
     return fileName
         .toLowerCase()
@@ -7,24 +7,3 @@ export function sanitizeBranchName(fileName) {
         .replace(/-+/g, "-") // Collapse multiple dashes
         .replace(/^-|-$/g, ""); // Remove leading/trailing dashes
 }
-/**
- * Validates a user-provided branch name against git's naming rules.
- * @throws ValidationError if the branch name is invalid
- */
-export function validateBranchName(branchName) {
-    if (!branchName || branchName.trim() === "") {
-        throw new ValidationError("Branch name cannot be empty");
-    }
-    if (branchName.startsWith(".") || branchName.startsWith("-")) {
-        throw new ValidationError('Branch name cannot start with "." or "-"');
-    }
-    // Git disallows: space, ~, ^, :, ?, *, [, \, and consecutive dots (..)
-    if (/[\s~^:?*[\\]/.test(branchName) || branchName.includes("..")) {
-        throw new ValidationError("Branch name contains invalid characters");
-    }
-    if (branchName.endsWith("/") ||
-        branchName.endsWith(".lock") ||
-        branchName.endsWith(".")) {
-        throw new ValidationError("Branch name has invalid ending");
-    }
-}

package/dist/cli/repo-sync-runner.js

@@ -56,8 +56,9 @@ async function runFileSyncPhase(repo, ctx) {
     const repoNumber = repo.index + 1;
     try {
         ctx.logger.progress(repoNumber, repo.repoName, "Processing...");
+        const branchName = repo.repoConfig.prOptions?.branch ?? ctx.branchName;
         const result = await ctx.processor.process(repo.repoConfig, repo.repoInfo, {
-            branchName: ctx.branchName,
+            branchName,
             workDir: repo.workDir,
             configId: ctx.config.id,
             dryRun: ctx.options.dryRun,
@@ -95,12 +96,16 @@ async function runFileSyncPhase(repo, ctx) {
 export async function runSingleRepo(repoConfig, index, ctx) {
     const { config, options, logger } = ctx;
     const repoNumber = index + 1;
-    const effectivePrOptions = options.merge || options.mergeStrategy || options.deleteBranch
+    const effectivePrOptions = options.merge ||
+        options.mergeStrategy ||
+        options.deleteBranch ||
+        options.branch
         ? {
             ...repoConfig.prOptions,
             merge: options.merge ?? repoConfig.prOptions?.merge,
             mergeStrategy: options.mergeStrategy ?? repoConfig.prOptions?.mergeStrategy,
             deleteBranch: options.deleteBranch ?? repoConfig.prOptions?.deleteBranch,
+            branch: options.branch ?? repoConfig.prOptions?.branch,
         }
         : repoConfig.prOptions;
     const effectiveRepoConfig = { ...repoConfig, prOptions: effectivePrOptions };

package/dist/config/loader.js

@@ -1,5 +1,5 @@
 import { readFileSync, statSync, readdirSync } from "node:fs";
-import { dirname, join, extname } from "node:path";
+import { dirname, join, extname, relative } from "node:path";
 import { parse } from "yaml";
 import { validateRawConfig } from "./validator.js";
 import { normalizeConfig as normalizeConfigInternal } from "./normalizer.js";
@@ -51,49 +51,78 @@ function loadRawConfigFromFile(filePath) {
     validateRawConfig(rawConfig);
     return rawConfig;
 }
-function loadRawConfigFromDirectory(dirPath) {
+const MAX_CONFIG_DEPTH = 10;
+function collectYamlFiles(rootDir, currentDir, depth) {
+    if (depth > MAX_CONFIG_DEPTH) {
+        /* c8 ignore next -- rootDir === currentDir impossible at depth > MAX_CONFIG_DEPTH */
+        const rel = relative(rootDir, currentDir) || ".";
+        throw new ValidationError(`Config directory nesting exceeds maximum depth of ${MAX_CONFIG_DEPTH} at ${rel}`);
+    }
     let entries;
     try {
-        entries = readdirSync(dirPath, { withFileTypes: true });
+        entries = readdirSync(currentDir, { withFileTypes: true });
     }
     catch (error) {
-        throw new ValidationError(`Failed to read config directory ${dirPath}: ${toErrorMessage(error)}`, { cause: error });
+        const displayPath = relative(rootDir, currentDir) || currentDir;
+        throw new ValidationError(`Failed to read config directory ${displayPath}: ${toErrorMessage(error)}`, { cause: error });
     }
-    const yamlFiles = entries
-        .filter((entry) => entry.isFile() &&
-        [".yaml", ".yml"].includes(extname(entry.name).toLowerCase()))
-        .map((entry) => entry.name)
-        .sort();
+    const files = [];
+    const subdirs = [];
+    for (const entry of entries) {
+        if (entry.name.startsWith(".")) {
+            continue;
+        }
+        const ext = extname(entry.name).toLowerCase();
+        const isYaml = ext === ".yaml" || ext === ".yml";
+        if ((entry.isFile() || entry.isSymbolicLink()) && isYaml) {
+            files.push({
+                relativePath: relative(rootDir, join(currentDir, entry.name)),
+                absolutePath: join(currentDir, entry.name),
+            });
+        }
+        else if (entry.isDirectory()) {
+            subdirs.push(entry.name);
+        }
+    }
+    files.sort((a, b) => a.relativePath.localeCompare(b.relativePath));
+    subdirs.sort((a, b) => a.localeCompare(b));
+    const result = [...files];
+    for (const subdir of subdirs) {
+        result.push(...collectYamlFiles(rootDir, join(currentDir, subdir), depth + 1));
+    }
+    return result;
+}
+function loadRawConfigFromDirectory(dirPath) {
+    const yamlFiles = collectYamlFiles(dirPath, dirPath, 0);
     if (yamlFiles.length === 0) {
         throw new ValidationError(`No .yaml or .yml files found in directory: ${dirPath}`);
     }
-    const fragments = yamlFiles.map((fileName) => {
-        const filePath = join(dirPath, fileName);
+    const fragments = yamlFiles.map(({ relativePath, absolutePath }) => {
         let content;
         try {
-            content = readFileSync(filePath, "utf-8");
+            content = readFileSync(absolutePath, "utf-8");
         }
         catch (error) {
-            throw new ValidationError(`Failed to read config file ${filePath}: ${toErrorMessage(error)}`, { cause: error });
+            throw new ValidationError(`Failed to read config file ${relativePath}: ${toErrorMessage(error)}`, { cause: error });
         }
-        const configDir = dirname(filePath);
+        const configDir = dirname(absolutePath);
         let config;
         try {
             config = parse(content);
         }
         catch (error) {
             const message = toErrorMessage(error);
-            throw new ValidationError(`Failed to parse YAML config at ${filePath}: ${message}`, { cause: error });
+            throw new ValidationError(`Failed to parse YAML config at ${relativePath}: ${message}`, { cause: error });
         }
         if (!config || typeof config !== "object") {
-            throw new ValidationError(`Config file ${fileName} is empty or invalid — expected a YAML mapping`);
+            throw new ValidationError(`Config file ${relativePath} is empty or invalid — expected a YAML mapping`);
         }
         // Safe cast: resolveFileReferencesInConfig only accesses optional fields
         // (files, groups, etc.), so fragments missing id/repos work correctly.
         config = resolveFileReferencesInConfig(config, {
             configDir,
         });
-        return { fileName, config };
+        return { fileName: relativePath, config };
     });
     const merged = mergeConfigFragments(fragments);
     validateRawConfig(merged);

package/dist/config/types.d.ts

@@ -7,6 +7,7 @@ export interface PRMergeOptions {
     deleteBranch?: boolean;
     bypassReason?: string;
     labels?: string[];
+    branch?: string;
 }
 export type RulesetTarget = "branch" | "tag";
 export type RulesetEnforcement = "active" | "disabled" | "evaluate";

package/dist/config/validator.js

@@ -1,6 +1,7 @@
 import { validateFileName } from "./validators/file-validator.js";
 import { isPlainObject } from "../shared/type-guards.js";
 import { ValidationError } from "../shared/errors.js";
+import { validateBranchName } from "../shared/branch-validation.js";
 import { validateFileConfigFields, validateSettings, } from "./validators/shared.js";
 import { validateGroups, validateConditionalGroups, } from "./validators/group-validator.js";
 import { validateRepoEntry } from "./validators/repo-entry-validator.js";
@@ -68,6 +69,9 @@ function validateGithubHosts(config) {
     }
 }
 function validatePrOptions(config) {
+    if (config.prOptions?.branch !== undefined) {
+        validateBranchName(config.prOptions.branch);
+    }
     if (config.prOptions?.labels === undefined)
         return;
     if (!Array.isArray(config.prOptions.labels)) {

package/dist/config/validators/group-validator.js

@@ -1,6 +1,7 @@
 import { resolveExtendsChain } from "../extends-resolver.js";
 import { isPlainObject } from "../../shared/type-guards.js";
 import { ValidationError } from "../../shared/errors.js";
+import { validateBranchName } from "../../shared/branch-validation.js";
 import { validateFileConfigFields, validateSettings, buildRootSettingsContext, } from "./shared.js";
 function validateGroupExtends(groupName, extends_, groupNames) {
     if (typeof extends_ === "string") {
@@ -102,6 +103,9 @@ export function validateGroups(config) {
         if (group.settings !== undefined) {
             validateSettings(group.settings, `groups.${groupName}`, rootCtx);
         }
+        if (group.prOptions?.branch !== undefined) {
+            validateBranchName(group.prOptions.branch);
+        }
     }
     validateNoCircularExtends(config.groups);
 }
@@ -163,5 +167,8 @@ export function validateConditionalGroups(config) {
         if (entry.settings !== undefined) {
             validateSettings(entry.settings, ctx, rootCtx);
         }
+        if (entry.prOptions?.branch !== undefined) {
+            validateBranchName(entry.prOptions.branch);
+        }
     }
 }

package/dist/config/validators/repo-entry-validator.js

@@ -3,6 +3,7 @@ import { validateFileName } from "./file-validator.js";
 import { isPlainObject } from "../../shared/type-guards.js";
 import { escapeRegExp } from "../../shared/regex-utils.js";
 import { ValidationError } from "../../shared/errors.js";
+import { validateBranchName } from "../../shared/branch-validation.js";
 import { validateFileConfigFields, validateSettings, buildRootSettingsContext, enrichSettingsContext, } from "./shared.js";
 function isValidGitUrl(url) {
     return /^git@[^:]+:.+$/.test(url) || /^https?:\/\/[^/]+\/.+$/.test(url);
@@ -156,10 +157,16 @@ function validateRepoSettingsEntry(config, repo, repoLabel) {
     }
     validateSettings(repo.settings, `Repo ${repoLabel}`, rootCtx);
 }
+function validateRepoPrOptions(repo) {
+    if (repo.prOptions?.branch !== undefined) {
+        validateBranchName(repo.prOptions.branch);
+    }
+}
 export function validateRepoEntry(config, repo, index) {
     const repoLabel = validateRepoGitField(repo, index);
     validateRepoOrigins(config, repo, repoLabel);
     validateRepoGroups(config, repo, index);
     validateRepoFiles(config, repo, index, repoLabel);
     validateRepoSettingsEntry(config, repo, repoLabel);
+    validateRepoPrOptions(repo);
 }

package/dist/shared/branch-validation.d.ts

@@ -0,0 +1,2 @@
+/** Validates a user-provided branch name against git's naming rules. @throws ValidationError if the branch name is invalid */
+export declare function validateBranchName(branchName: string): void;

package/dist/shared/branch-validation.js

@@ -0,0 +1,19 @@
+import { ValidationError } from "./errors.js";
+/** Validates a user-provided branch name against git's naming rules. @throws ValidationError if the branch name is invalid */
+export function validateBranchName(branchName) {
+    if (!branchName || branchName.trim() === "") {
+        throw new ValidationError("Branch name cannot be empty");
+    }
+    if (branchName.startsWith(".") || branchName.startsWith("-")) {
+        throw new ValidationError('Branch name cannot start with "." or "-"');
+    }
+    // Git disallows: space, ~, ^, :, ?, *, [, \, and consecutive dots (..)
+    if (/[\s~^:?*[\\]/.test(branchName) || branchName.includes("..")) {
+        throw new ValidationError("Branch name contains invalid characters");
+    }
+    if (branchName.endsWith("/") ||
+        branchName.endsWith(".lock") ||
+        branchName.endsWith(".")) {
+        throw new ValidationError("Branch name has invalid ending");
+    }
+}

package/dist/sync/file-writer.js

@@ -41,12 +41,33 @@ export class FileWriter {
         if (file.createOnly) {
             const existsOnBase = await gitOps.fileExistsOnBranch(file.fileName, baseBranch);
             if (existsOnBase) {
-                log.info(`Skipping ${file.fileName} (createOnly: exists on ${baseBranch})`);
-                fileChanges.set(file.fileName, {
-                    fileName: file.fileName,
-                    content: null,
-                    action: "skip",
-                });
+                const desiredMode = shouldBeExecutable(file)
+                    ? "100755"
+                    : "100644";
+                const currentMode = await gitOps.getFileMode(file.fileName);
+                modeCache.set(file.fileName, currentMode);
+                const modeDiffers = currentMode !== null && currentMode !== desiredMode;
+                if (modeDiffers) {
+                    fileChanges.set(file.fileName, {
+                        fileName: file.fileName,
+                        content: null,
+                        action: "update",
+                        mode: desiredMode,
+                        modeOnly: true,
+                    });
+                    incrementDiffStats(diffStats, "MODIFIED");
+                    if (dryRun) {
+                        log.info(`Would change mode: ${file.fileName} ${currentMode} -> ${desiredMode}`);
+                    }
+                }
+                else {
+                    log.info(`Skipping ${file.fileName} (createOnly: exists on ${baseBranch})`);
+                    fileChanges.set(file.fileName, {
+                        fileName: file.fileName,
+                        content: null,
+                        action: "skip",
+                    });
+                }
                 return;
             }
         }

package/package.json

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