@aspruyt/xfg 6.0.3 → 6.2.0

package/dist/vcs/pr-strategy.d.ts

@@ -1,19 +1,18 @@
 import type { DebugWarnLog } from "../shared/logger.js";
 import type { PRResult } from "./types.js";
 import type { ICommandExecutor } from "../shared/command-executor.js";
-import type { MergeResult, PRStrategyOptions, MergeOptions, CloseExistingPROptions, IPRStrategy } from "./types.js";
+import type { MergeResult, PRStrategyOptions, MergeOptions, CloseExistingPROptions, ClosePRResult, IPRStrategy } from "./types.js";
 export interface IPRStrategyLogger {
     debug(msg: string): void;
     warn(msg: string): void;
     info(msg: string): void;
 }
 export declare abstract class BasePRStrategy implements IPRStrategy {
-    protected bodyFilePath: string;
     protected executor: ICommandExecutor;
     protected log?: IPRStrategyLogger;
     constructor(executor: ICommandExecutor, log?: IPRStrategyLogger);
     abstract findExistingPRUrl(options: CloseExistingPROptions): Promise<string | null>;
-    abstract closeExistingPR(options: CloseExistingPROptions): Promise<boolean>;
+    abstract closeExistingPR(options: CloseExistingPROptions): Promise<ClosePRResult>;
     abstract create(options: PRStrategyOptions): Promise<PRResult>;
     abstract merge(options: MergeOptions): Promise<MergeResult>;
     /**

package/dist/vcs/pr-strategy.js

@@ -1,7 +1,6 @@
 import { toErrorMessage } from "../shared/type-guards.js";
 import { withRetry, isPermanentError } from "../shared/retry-utils.js";
 export class BasePRStrategy {
-    bodyFilePath = ".pr-body.md";
     executor;
     log;
     constructor(executor, log) {

package/dist/vcs/types.d.ts

@@ -1,5 +1,13 @@
 import type { RepoInfo } from "../repo/index.js";
 import type { MergeMode, MergeStrategy } from "../config/index.js";
+export type ClosePRResult = {
+    status: "no_pr";
+} | {
+    status: "closed";
+} | {
+    status: "close_failed";
+    message: string;
+};
 export interface GitAuthOptions {
     token: string;
     /** e.g., "github.com", "github.mycompany.com" */
@@ -125,11 +133,7 @@ export interface IPRStrategy {
      * @returns PR URL if exists, null if not found or on error
      */
     findExistingPRUrl(options: CloseExistingPROptions): Promise<string | null>;
-    /**
-     * Close an existing PR and delete its branch.
-     * @returns true if PR was closed, false if no PR existed
-     */
-    closeExistingPR(options: CloseExistingPROptions): Promise<boolean>;
+    closeExistingPR(options: CloseExistingPROptions): Promise<ClosePRResult>;
     /**
      * Create a new PR. Throws on infrastructure failures; PRWorkflowExecutor
      * catches and converts to PRResult.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "6.0.3",
+  "version": "6.2.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",
@@ -29,14 +29,14 @@
     "url": "https://github.com/anthony-spruyt/xfg/issues"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "scripts": {
     "build": "tsc",
     "start": "node dist/cli.js",
     "dev": "tsx src/cli.ts",
     "test": "node --import tsx scripts/run-tests.js",
-    "test:coverage": "c8 --check-coverage --lines 95 --reporter=text --reporter=lcov --all --src=src --exclude='test/**/*.test.ts' --exclude='scripts/**' --exclude='src/vcs/types.ts' --exclude='src/settings/rulesets/types.ts' --exclude='src/settings/repo-settings/types.ts' --exclude='src/settings/labels/types.ts' --exclude='src/**/index.ts' --exclude='test/mocks/**' --exclude='src/sync/types.ts' --exclude='src/lifecycle/types.ts' --exclude='src/cli/program.ts' --exclude='src/cli.ts' --exclude='src/index.ts' npm test",
+    "test:coverage": "c8 --check-coverage --lines 95 --reporter=text --reporter=lcov --all --src=src --exclude='test/**/*.test.ts' --exclude='scripts/**' --exclude='src/vcs/types.ts' --exclude='src/settings/rulesets/types.ts' --exclude='src/settings/repo-settings/types.ts' --exclude='src/settings/labels/types.ts' --exclude='src/**/index.ts' --exclude='test/mocks/**' --exclude='src/sync/types.ts' --exclude='src/lifecycle/types.ts' --exclude='src/cli/program.ts' --exclude='src/cli/types.ts' --exclude='src/cli.ts' --exclude='src/index.ts' npm test",
     "test:integration:github": "npm run build && node --import tsx --test test/integration/github.test.ts",
     "test:integration:ado": "npm run build && node --import tsx --test test/integration/ado.test.ts",
     "test:integration:gitlab": "npm run build && node --import tsx --test test/integration/gitlab.test.ts",
@@ -74,7 +74,7 @@
     "chalk": "^5.3.0",
     "commander": "^14.0.2",
     "json5": "^2.2.3",
-    "p-retry": "^7.1.1",
+    "p-retry": "^8.0.0",
     "yaml": "^2.4.5"
   },
   "devDependencies": {
@@ -82,6 +82,6 @@
     "bottleneck": "^2.19.5",
     "c8": "^11.0.0",
     "tsx": "^4.15.0",
-    "typescript": "^5.4.5"
+    "typescript": "^6.0.0"
   }
 }

package/dist/config/validators/index.d.ts

@@ -1,3 +0,0 @@
-export { isTextContent, isObjectContent, isStructuredFileExtension, validateFileName, VALID_STRATEGIES, } from "./file-validator.js";
-export { validateRepoSettings } from "./repo-settings-validator.js";
-export { validateRuleset } from "./ruleset-validator.js";

package/dist/config/validators/index.js

@@ -1,6 +0,0 @@
-// File validation
-export { isTextContent, isObjectContent, isStructuredFileExtension, validateFileName, VALID_STRATEGIES, } from "./file-validator.js";
-// Repo settings validation
-export { validateRepoSettings } from "./repo-settings-validator.js";
-// Ruleset validation
-export { validateRuleset } from "./ruleset-validator.js";

package/dist/output/types.d.ts

@@ -1,20 +0,0 @@
-import type { MergeMode } from "../config/index.js";
-import type { FileChangeDetail } from "../sync/index.js";
-export type ReportFileChange = FileChangeDetail;
-export interface SyncReport {
-    repos: RepoFileChanges[];
-    totals: {
-        files: {
-            create: number;
-            update: number;
-            delete: number;
-        };
-    };
-}
-export interface RepoFileChanges {
-    repoName: string;
-    files: ReportFileChange[];
-    prUrl?: string;
-    mergeOutcome?: MergeMode;
-    error?: string;
-}

package/dist/output/types.js

@@ -1 +0,0 @@
-export {};

package/dist/shared/shell-utils.d.ts

@@ -1,6 +0,0 @@
-export declare function escapeRegExp(str: string): string;
-/**
- * Escapes a string for safe use as a shell argument.
- * Uses single quotes and escapes any single quotes within the string.
- */
-export declare function escapeShellArg(arg: string): string;

package/dist/shared/shell-utils.js

@@ -1,17 +0,0 @@
-import { ValidationError } from "./errors.js";
-export function escapeRegExp(str) {
-    return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-/**
- * Escapes a string for safe use as a shell argument.
- * Uses single quotes and escapes any single quotes within the string.
- */
-export function escapeShellArg(arg) {
-    // Defense-in-depth: reject null bytes even if upstream validation should catch them
-    if (arg.includes("\0")) {
-        throw new ValidationError("Shell argument contains null byte");
-    }
-    // Use single quotes and escape any single quotes within
-    // 'string' -> quote ends, escaped quote, quote starts again
-    return `'${arg.replace(/'/g, "'\\''")}'`;
-}