@aspruyt/xfg 3.13.1 → 4.0.1

package/dist/sync/diff-utils.js

@@ -1,27 +1,10 @@
 import chalk from "chalk";
-/**
- * Determines file status based on existence and change detection.
- */
+export { formatStatusBadge } from "../shared/file-status.js";
 export function getFileStatus(exists, changed) {
     if (!exists)
         return "NEW";
     return changed ? "MODIFIED" : "UNCHANGED";
 }
-/**
- * Format a status badge with appropriate color.
- */
-export function formatStatusBadge(status) {
-    switch (status) {
-        case "NEW":
-            return chalk.green("[NEW]");
-        case "MODIFIED":
-            return chalk.yellow("[MODIFIED]");
-        case "UNCHANGED":
-            return chalk.gray("[UNCHANGED]");
-        case "DELETED":
-            return chalk.red("[DELETED]");
-    }
-}
 /**
  * Format a single diff line with appropriate color.
  */
@@ -38,7 +21,7 @@ export function formatDiffLine(line) {
  * Generate a unified diff between old and new content.
  * Returns an array of formatted diff lines.
  */
-export function generateDiff(oldContent, newContent, fileName, contextLines = 3) {
+export function generateDiff(oldContent, newContent, _fileName, contextLines = 3) {
     const oldLines = oldContent ? oldContent.split("\n") : [];
     const newLines = newContent.split("\n");
     // For new files, show all lines as additions

package/dist/sync/file-sync-orchestrator.js

@@ -10,21 +10,22 @@ export class FileSyncOrchestrator {
         this.log = log;
     }
     async sync(repoConfig, repoInfo, session, options) {
-        const { workDir, dryRun, noDelete, configId } = options;
-        // Write files
+        const { workDir, configId } = options;
+        const dryRun = options.dryRun ?? false;
+        const noDelete = options.noDelete ?? false;
         const { fileChanges, diffStats } = await this.fileWriter.writeFiles(repoConfig.files, {
             repoInfo,
             baseBranch: session.baseBranch,
             workDir,
-            dryRun: dryRun ?? false,
-            noDelete: noDelete ?? false,
+            dryRun,
+            noDelete,
             configId,
+            isGraphQLCommitMode: options.isGraphQLCommitMode,
         }, { gitOps: session.gitOps, log: this.log });
-        // Handle orphans
-        const existingManifest = loadManifest(workDir);
+        const existingManifest = loadManifest(workDir, this.log);
         const filesWithDeleteOrphaned = new Map(repoConfig.files.map((f) => [f.fileName, f.deleteOrphaned]));
         const { manifest: newManifest, filesToDelete } = this.manifestManager.processOrphans(workDir, configId, filesWithDeleteOrphaned);
-        await this.manifestManager.deleteOrphans(filesToDelete, { dryRun: dryRun ?? false, noDelete: noDelete ?? false }, { gitOps: session.gitOps, log: this.log, fileChanges });
+        await this.manifestManager.deleteOrphans(filesToDelete, { dryRun: dryRun, noDelete: noDelete }, { gitOps: session.gitOps, log: this.log, fileChanges });
         // Update diff stats for deletions in dry-run
         if (dryRun && filesToDelete.length > 0 && !noDelete) {
             for (const fileName of filesToDelete) {
@@ -34,7 +35,7 @@ export class FileSyncOrchestrator {
             }
         }
         // Save manifest
-        this.manifestManager.saveUpdatedManifest(workDir, newManifest, existingManifest, dryRun ?? false, fileChanges);
+        this.manifestManager.saveUpdatedManifest(workDir, newManifest, existingManifest, dryRun, fileChanges);
         // Show diff summary in dry-run
         if (dryRun) {
             this.log.diffSummary(diffStats.newCount, diffStats.modifiedCount, diffStats.unchangedCount, diffStats.deletedCount);

package/dist/sync/file-writer.d.ts

@@ -5,7 +5,7 @@ import type { IFileWriter, FileWriteContext, FileWriterDeps, FileWriteAllResult
  * .sh files are auto-executable unless explicit executable: false is set.
  * Non-.sh files are executable only if executable: true is explicitly set.
  */
-export declare function shouldBeExecutable(file: FileContent): boolean;
+declare function shouldBeExecutable(file: FileContent): boolean;
 /**
  * Handles file writing, template interpolation, and executable permissions.
  */
@@ -16,3 +16,4 @@ export declare class FileWriter implements IFileWriter {
     static shouldBeExecutable: typeof shouldBeExecutable;
     writeFiles(files: FileContent[], ctx: FileWriteContext, deps: FileWriterDeps): Promise<FileWriteAllResult>;
 }
+export {};

package/dist/sync/file-writer.js

@@ -1,15 +1,14 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { convertContentToString } from "../config/formatter.js";
-import { interpolateXfgContent } from "./xfg-template.js";
+import { interpolateXfgContent } from "../shared/xfg-template.js";
 import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, } from "./diff-utils.js";
-import { hasGitHubAppCredentials } from "../vcs/commit-strategy-selector.js";
 /**
  * Determines if a file should be marked as executable.
  * .sh files are auto-executable unless explicit executable: false is set.
  * Non-.sh files are executable only if executable: true is explicitly set.
  */
-export function shouldBeExecutable(file) {
+function shouldBeExecutable(file) {
     const isShellScript = file.fileName.endsWith(".sh");
     if (file.executable !== undefined) {
         // Explicit setting takes precedence
@@ -31,7 +30,6 @@ export class FileWriter {
         const { gitOps, log } = deps;
         const fileChanges = new Map();
         const diffStats = createDiffStats();
-        // Step 1: Process each file
         for (const file of files) {
             const filePath = join(workDir, file.fileName);
             const fileExistsLocal = existsSync(filePath);
@@ -86,14 +84,13 @@ export class FileWriter {
                 gitOps.writeFile(file.fileName, fileContent);
             }
         }
-        // Step 2: Set executable permissions (skip skipped files)
         for (const file of files) {
             const tracked = fileChanges.get(file.fileName);
             if (tracked?.action === "skip") {
                 continue;
             }
             if (shouldBeExecutable(file)) {
-                if (tracked?.action === "create" && hasGitHubAppCredentials()) {
+                if (tracked?.action === "create" && ctx.isGraphQLCommitMode) {
                     log.warn(`${file.fileName}: GitHub App commits cannot set executable mode on new files. ` +
                         `The file will be created as non-executable (100644). ` +
                         `See: https://anthony-spruyt.github.io/xfg/examples/executable-files/`);

package/dist/sync/index.d.ts

@@ -1,17 +1,3 @@
-export { FileWriter, shouldBeExecutable } from "./file-writer.js";
-export { ManifestManager } from "./manifest-manager.js";
-export { BranchManager } from "./branch-manager.js";
-export { AuthOptionsBuilder } from "./auth-options-builder.js";
-export { RepositorySession } from "./repository-session.js";
-export { CommitPushManager } from "./commit-push-manager.js";
-export { formatCommitMessage } from "./commit-message.js";
-export { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
-export { PRMergeHandler } from "./pr-merge-handler.js";
-export { FileSyncStrategy } from "./file-sync-strategy.js";
-export { ManifestStrategy, type ManifestUpdateParams, } from "./manifest-strategy.js";
-export { SyncWorkflow } from "./sync-workflow.js";
-export type { IFileWriter, FileWriteContext, FileWriterDeps, FileWriteAllResult, FileWriteResult, IManifestManager, OrphanProcessResult, OrphanDeleteOptions, OrphanDeleteDeps, IBranchManager, BranchSetupOptions, IAuthOptionsBuilder, AuthResult, IRepositorySession, SessionOptions, SessionContext, ICommitPushManager, CommitPushOptions, CommitPushResult, GitOpsFactory, IRepositoryProcessor, ProcessorOptions, ProcessorResult, FileChangeDetail, IFileSyncOrchestrator, FileSyncResult, IPRMergeHandler, PRHandlerOptions, WorkResult, IWorkStrategy, ISyncWorkflow, } from "./types.js";
+export type { DiffStats } from "./diff-utils.js";
+export type { GitOpsFactory, IAuthOptionsBuilder, IBranchManager, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, IRepositoryProcessor, IRepositorySession, ISyncWorkflow, IWorkStrategy, ProcessorResult, SessionContext, WorkResult, } from "./types.js";
 export { RepositoryProcessor } from "./repository-processor.js";
-export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, getManagedRulesets, getManagedLabels, updateManifest, updateManifestRulesets, updateManifestLabels, MANIFEST_FILENAME, type XfgManifest, type XfgManifestConfigEntry, } from "./manifest.js";
-export { getFileStatus, formatStatusBadge, formatDiffLine, generateDiff, createDiffStats, incrementDiffStats, type FileStatus, type DiffStats, } from "./diff-utils.js";
-export { interpolateXfgContent, type XfgTemplateContext, type XfgInterpolationOptions, } from "./xfg-template.js";

package/dist/sync/index.js

@@ -1,21 +1 @@
-export { FileWriter, shouldBeExecutable } from "./file-writer.js";
-export { ManifestManager } from "./manifest-manager.js";
-export { BranchManager } from "./branch-manager.js";
-export { AuthOptionsBuilder } from "./auth-options-builder.js";
-export { RepositorySession } from "./repository-session.js";
-export { CommitPushManager } from "./commit-push-manager.js";
-export { formatCommitMessage } from "./commit-message.js";
-export { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
-export { PRMergeHandler } from "./pr-merge-handler.js";
-// Strategy pattern components
-export { FileSyncStrategy } from "./file-sync-strategy.js";
-export { ManifestStrategy, } from "./manifest-strategy.js";
-export { SyncWorkflow } from "./sync-workflow.js";
-// Repository processor
 export { RepositoryProcessor } from "./repository-processor.js";
-// Manifest handling
-export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, getManagedRulesets, getManagedLabels, updateManifest, updateManifestRulesets, updateManifestLabels, MANIFEST_FILENAME, } from "./manifest.js";
-// Diff utilities
-export { getFileStatus, formatStatusBadge, formatDiffLine, generateDiff, createDiffStats, incrementDiffStats, } from "./diff-utils.js";
-// XFG templating
-export { interpolateXfgContent, } from "./xfg-template.js";

package/dist/sync/manifest-manager.d.ts

@@ -4,6 +4,10 @@ import type { IManifestManager, OrphanProcessResult, OrphanDeleteOptions, Orphan
  * Handles manifest loading, saving, and orphan detection.
  */
 export declare class ManifestManager implements IManifestManager {
+    private readonly log?;
+    constructor(log?: {
+        debug(msg: string): void;
+    } | undefined);
     processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
     deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): Promise<void>;
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;

package/dist/sync/manifest-manager.js

@@ -5,8 +5,12 @@ import { loadManifest, saveManifest, updateManifest, MANIFEST_FILENAME, } from "
  * Handles manifest loading, saving, and orphan detection.
  */
 export class ManifestManager {
+    log;
+    constructor(log) {
+        this.log = log;
+    }
     processOrphans(workDir, configId, filesWithDeleteOrphaned) {
-        const existingManifest = loadManifest(workDir);
+        const existingManifest = loadManifest(workDir, this.log);
         const { manifest, filesToDelete } = updateManifest(existingManifest, configId, filesWithDeleteOrphaned);
         return { manifest, filesToDelete };
     }

package/dist/sync/manifest.d.ts

@@ -1,106 +1,33 @@
 export declare const MANIFEST_FILENAME = ".xfg.json";
 export interface XfgManifestConfigEntry {
     files?: string[];
-    rulesets?: string[];
-    labels?: string[];
 }
 export interface XfgManifest {
-    version: 3;
+    version: 4;
     configs: Record<string, XfgManifestConfigEntry>;
 }
-/**
- * Creates an empty manifest with the current version.
- */
 export declare function createEmptyManifest(): XfgManifest;
 /**
- * Loads the xfg manifest from a repository's working directory.
- * Returns null if the manifest file doesn't exist or is v1 format.
- *
- * V1 manifests are treated as non-existent because they lack the config ID
- * namespace required for multi-config support. The next run will create
- * a fresh v3 manifest.
- *
- * V2 manifests are automatically migrated to V3 format.
- *
- * @param workDir - The repository working directory
- * @returns The manifest or null if not found or incompatible
+ * Loads and migrates manifest from workDir. V1 returns null (no config-ID namespace);
+ * V2/V3 are auto-migrated to V4.
  */
-export declare function loadManifest(workDir: string): XfgManifest | null;
+export declare function loadManifest(workDir: string, log?: {
+    debug(msg: string): void;
+}): XfgManifest | null;
 /**
  * Parses manifest content from a string (e.g., fetched from a remote API).
  * Handles V2→V3 migration, returns null for V1/unknown/invalid formats.
  */
-export declare function parseManifestContent(content: string): XfgManifest | null;
-/**
- * Saves the xfg manifest to a repository's working directory.
- *
- * @param workDir - The repository working directory
- * @param manifest - The manifest to save
- */
+export declare function parseManifestContent(content: string, log?: {
+    debug(msg: string): void;
+}): XfgManifest | null;
 export declare function saveManifest(workDir: string, manifest: XfgManifest): void;
-/**
- * Gets the list of managed files for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- *
- * @param manifest - The manifest or null
- * @param configId - The config ID to get files for
- * @returns Array of managed file names for the given config
- */
 export declare function getManagedFiles(manifest: XfgManifest | null, configId: string): string[];
 /**
- * Gets the list of managed rulesets for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- *
- * @param manifest - The manifest or null
- * @param configId - The config ID to get rulesets for
- * @returns Array of managed ruleset names for the given config
- */
-export declare function getManagedRulesets(manifest: XfgManifest | null, configId: string): string[];
-/**
- * Gets the list of managed labels for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- */
-export declare function getManagedLabels(manifest: XfgManifest | null, configId: string): string[];
-/**
- * Updates the manifest with the current set of files that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's files namespace - other configs are untouched.
- *
- * Files with deleteOrphaned: true are added to managedFiles.
- * Files with deleteOrphaned: false (explicit) are removed from managedFiles.
- * Files not in the config but in managedFiles for this configId are candidates for deletion.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param filesWithDeleteOrphaned - Map of fileName to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of files to delete
+ * Updates manifest tracking for a config. Files with deleteOrphaned: true are tracked;
+ * files previously tracked but no longer in config are returned as filesToDelete.
  */
 export declare function updateManifest(manifest: XfgManifest | null, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): {
     manifest: XfgManifest;
     filesToDelete: string[];
 };
-/**
- * Updates the manifest with the current set of rulesets that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's rulesets namespace - other configs are untouched.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param rulesetsWithDeleteOrphaned - Map of ruleset name to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of rulesets to delete
- */
-export declare function updateManifestRulesets(manifest: XfgManifest | null, configId: string, rulesetsWithDeleteOrphaned: Map<string, boolean | undefined>): {
-    manifest: XfgManifest;
-    rulesetsToDelete: string[];
-};
-/**
- * Updates the manifest with the current set of labels that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's labels namespace - other configs are untouched.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param labelsWithDeleteOrphaned - Map of label name to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of labels to delete
- */
-export declare function updateManifestLabels(manifest: XfgManifest | null, configId: string, labelsWithDeleteOrphaned: Map<string, boolean | undefined>): {
-    manifest: XfgManifest;
-    labelsToDelete: string[];
-};