@aspruyt/xfg 4.0.5 → 5.0.1

package/dist/vcs/gitlab-pr-strategy.js

@@ -5,7 +5,7 @@ import { assertGitLabRepo } from "../shared/repo-detector.js";
 import { BasePRStrategy } from "./pr-strategy.js";
 import { withRetry, isPermanentError } from "../shared/retry-utils.js";
 import { getStderr } from "../shared/command-executor.js";
-import { parseApiJson } from "../shared/gh-api-utils.js";
+import { parseApiJson } from "../shared/json-utils.js";
 import { sanitizeCredentials } from "../shared/sanitize-utils.js";
 import { toErrorMessage, safeCleanup } from "../shared/type-guards.js";
 import { NO_OP_DEBUG_LOG } from "../shared/logger.js";
@@ -146,7 +146,12 @@ export class GitLabPRStrategy extends BasePRStrategy {
         assertGitLabRepo(repoInfo, "GitLab PR strategy");
         const repoFlag = this.getRepoFlag(repoInfo);
         const descFile = join(workDir, this.bodyFilePath);
-        writeFileSync(descFile, body, "utf-8");
+        try {
+            writeFileSync(descFile, body, "utf-8");
+        }
+        catch (err) {
+            throw new SyncError(`Failed to write PR description to ${descFile}: ${toErrorMessage(err)}`);
+        }
         // glab mr create with description from file
         const command = `glab mr create --source-branch ${escapeShellArg(branchName)} --target-branch ${escapeShellArg(baseBranch)} --title ${escapeShellArg(title)} --description "$(cat ${escapeShellArg(descFile)})" --yes -R ${escapeShellArg(repoFlag)}`;
         try {

package/dist/vcs/graphql-commit-strategy.js

@@ -2,7 +2,8 @@ import { isGitHubRepo } from "../shared/repo-detector.js";
 import { escapeShellArg } from "../shared/shell-utils.js";
 import { withRetry, CORE_PERMANENT_ERROR_PATTERNS, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "../shared/retry-utils.js";
 import { toErrorMessage } from "../shared/type-guards.js";
-import { parseApiJson, buildTokenEnv } from "../shared/gh-api-utils.js";
+import { parseApiJson } from "../shared/json-utils.js";
+import { buildTokenEnv } from "../shared/gh-api-utils.js";
 import { ValidationError, GraphQLApiError } from "../shared/errors.js";
 /**
  * Maximum payload size for GitHub GraphQL API (50MB).

package/dist/vcs/index.d.ts

@@ -2,3 +2,4 @@ export type { PRMergeConfig, FileChange, FileAction, IGitOps, ILocalGitOps, INet
 export type { GitOpsOptions } from "./git-ops.js";
 export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 export { getPRStrategy } from "./pr-strategy-factory.js";
+export { createPR, mergePR } from "./pr-creator.js";

package/dist/vcs/index.js

@@ -2,3 +2,5 @@
 export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 // PR strategy factory
 export { getPRStrategy } from "./pr-strategy-factory.js";
+// PR creation and merge
+export { createPR, mergePR } from "./pr-creator.js";

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

@@ -1,6 +1,6 @@
 import { RepoInfo } from "../shared/repo-detector.js";
 import type { IPRStrategyLogger } from "./pr-strategy.js";
-import type { FileAction, MergeResult, PRMergeConfig, PRResult } from "./types.js";
+import type { FileAction, IPRStrategy, MergeResult, PRMergeConfig, PRResult } from "./types.js";
 import { ICommandExecutor } from "../shared/command-executor.js";
 export type { FileAction };
 interface PROptions {
@@ -22,6 +22,8 @@ interface PROptions {
     labels?: string[];
     /** Optional logger for PR strategy debug/warn/info messages */
     log?: IPRStrategyLogger;
+    /** Pre-constructed PR strategy to reuse (avoids redundant instantiation) */
+    strategy?: IPRStrategy;
 }
 export type { PRResult } from "./types.js";
 /**
@@ -53,5 +55,7 @@ interface MergePROptions {
     token?: string;
     /** Optional logger for PR strategy debug/warn/info messages */
     log?: IPRStrategyLogger;
+    /** Pre-constructed PR strategy to reuse (avoids redundant instantiation) */
+    strategy?: IPRStrategy;
 }
 export declare function mergePR(options: MergePROptions): Promise<MergeResult>;

package/dist/vcs/pr-creator.js

@@ -106,8 +106,8 @@ export async function createPR(options) {
         };
     }
     // Get the appropriate strategy and execute via workflow executor
-    const strategy = getPRStrategy(repoInfo, executor, log);
-    const workflow = new PRWorkflowExecutor(strategy);
+    const resolvedStrategy = options.strategy ?? getPRStrategy(repoInfo, executor, log);
+    const workflow = new PRWorkflowExecutor(resolvedStrategy);
     return workflow.execute({
         repoInfo,
         title,
@@ -135,8 +135,8 @@ export async function mergePR(options) {
         };
     }
     // Get the appropriate strategy and execute merge
-    const strategy = getPRStrategy(repoInfo, executor, log);
-    return strategy.merge({
+    const resolvedStrategy = options.strategy ?? getPRStrategy(repoInfo, executor, log);
+    return resolvedStrategy.merge({
         prUrl,
         repoInfo,
         config: mergeConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "4.0.5",
+  "version": "5.0.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",

package/dist/output/index.d.ts

@@ -1,5 +0,0 @@
-export { formatSyncReportCLI, formatSyncReportMarkdown, writeSyncReportSummary, type SyncReport, type RepoFileChanges, type ReportFileChange, } from "./sync-report.js";
-export { formatSettingsReportCLI, formatSettingsReportMarkdown, writeSettingsReportSummary, type SettingsReport, type RepoChanges, type RulesetChange, type SettingChange, } from "./settings-report.js";
-export { formatUnifiedSummaryMarkdown, writeUnifiedSummary, } from "./unified-summary.js";
-export { formatSummary, shouldWriteSummary, writeSummary, type MergeOutcome, type FileChanges, type RulesetPlanDetail, type RepoSettingsPlanDetail, type RepoResult, type SummaryData, } from "./github-summary.js";
-export { getMergeOutcome, toFileChanges, buildRepoResult, buildErrorResult, } from "./summary-utils.js";

package/dist/output/index.js

@@ -1,10 +0,0 @@
-// Sync report (repo-grouped file changes)
-export { formatSyncReportCLI, formatSyncReportMarkdown, writeSyncReportSummary, } from "./sync-report.js";
-// Settings report (repo-grouped settings changes)
-export { formatSettingsReportCLI, formatSettingsReportMarkdown, writeSettingsReportSummary, } from "./settings-report.js";
-// Unified summary (lifecycle + sync + settings in one diff block)
-export { formatUnifiedSummaryMarkdown, writeUnifiedSummary, } from "./unified-summary.js";
-// GitHub Actions summary
-export { formatSummary, shouldWriteSummary, writeSummary, } from "./github-summary.js";
-// Summary utilities
-export { getMergeOutcome, toFileChanges, buildRepoResult, buildErrorResult, } from "./summary-utils.js";

package/dist/shared/index.d.ts

@@ -1,15 +0,0 @@
-export { Logger, NO_OP_DEBUG_LOG, type ILogger, type DebugLog, type DebugWarnLog, type DebugInfoLog, type DebugInfoWarnLog, } from "./logger.js";
-export { withRetry, isPermanentError, isTransientError, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "./retry-utils.js";
-export { ShellCommandExecutor, type ICommandExecutor, } from "./command-executor.js";
-export { escapeShellArg, escapeRegExp } from "./shell-utils.js";
-export { sanitizeCredentials } from "./sanitize-utils.js";
-export { interpolateEnvVars, interpolateContent, type EnvInterpolationOptions, } from "./env.js";
-export { generateWorkspaceName } from "./workspace-utils.js";
-export { detectRepoType, parseGitUrl, getRepoDisplayName, isGitHubRepo, isAzureDevOpsRepo, isGitLabRepo, type RepoInfo, type GitHubRepoInfo, type AzureDevOpsRepoInfo, type GitLabRepoInfo, } from "./repo-detector.js";
-export { ValidationError, GraphQLApiError, SyncError, LifecycleError, } from "./errors.js";
-export { formatStatusBadge, type FileStatus } from "./file-status.js";
-export { GhApiClient, getHostnameFlag, buildTokenEnv, resolveGitHubToken, isHttp404Error, parseApiJson, type GhApiOptions, } from "./gh-api-utils.js";
-export { interpolateString, interpolateValue, type InterpolationConfig, } from "./interpolation-engine.js";
-export { camelToSnake } from "./string-utils.js";
-export { isPlainObject, toErrorMessage, safeCleanup } from "./type-guards.js";
-export { interpolateXfgContent, type XfgTemplateContext, } from "./xfg-template.js";

package/dist/shared/index.js

@@ -1,30 +0,0 @@
-// Logging
-export { Logger, NO_OP_DEBUG_LOG, } from "./logger.js";
-// Retry utilities
-export { withRetry, isPermanentError, isTransientError, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "./retry-utils.js";
-// Command execution
-export { ShellCommandExecutor, } from "./command-executor.js";
-// Shell utilities
-export { escapeShellArg, escapeRegExp } from "./shell-utils.js";
-// Sanitization
-export { sanitizeCredentials } from "./sanitize-utils.js";
-// Environment
-export { interpolateEnvVars, interpolateContent, } from "./env.js";
-// Workspace utilities
-export { generateWorkspaceName } from "./workspace-utils.js";
-// Repository detection
-export { detectRepoType, parseGitUrl, getRepoDisplayName, isGitHubRepo, isAzureDevOpsRepo, isGitLabRepo, } from "./repo-detector.js";
-// Errors
-export { ValidationError, GraphQLApiError, SyncError, LifecycleError, } from "./errors.js";
-// File status
-export { formatStatusBadge } from "./file-status.js";
-// GitHub API utilities
-export { GhApiClient, getHostnameFlag, buildTokenEnv, resolveGitHubToken, isHttp404Error, parseApiJson, } from "./gh-api-utils.js";
-// Interpolation engine
-export { interpolateString, interpolateValue, } from "./interpolation-engine.js";
-// String utilities
-export { camelToSnake } from "./string-utils.js";
-// Type guards
-export { isPlainObject, toErrorMessage, safeCleanup } from "./type-guards.js";
-// XFG templating
-export { interpolateXfgContent, } from "./xfg-template.js";