@aspruyt/xfg 5.0.2 → 5.1.2

package/dist/config/merge.d.ts

@@ -15,8 +15,9 @@ export interface MergeContext {
  */
 export declare function deepMerge(base: Record<string, unknown>, overlay: Record<string, unknown>, ctx: MergeContext): Record<string, unknown>;
 /**
- * Strip merge directive keys ($arrayMerge, $override, etc.) from an object.
+ * Strip xfg merge directive keys ($arrayMerge, $values) from an object.
  * Works recursively on nested objects and arrays.
+ * Standard $-prefixed keys ($schema, $id, $ref, etc.) are preserved.
  */
 export declare function stripMergeDirectives(obj: Record<string, unknown>): Record<string, unknown>;
 /**

package/dist/config/merge.js

@@ -3,6 +3,12 @@
  * Supports per-field array merge strategies via $arrayMerge + $values directives.
  */
 import { isPlainObject } from "../shared/type-guards.js";
+/**
+ * Keys reserved for xfg merge directives.
+ * Only these are stripped during merge — standard $-prefixed keys
+ * like $schema, $id, $ref, $generated are preserved.
+ */
+const XFG_DIRECTIVES = new Set(["$arrayMerge", "$values"]);
 /**
  * Strategy map for array merge operations.
  * Extensible: add new strategies by adding to this map.
@@ -34,7 +40,7 @@ export function deepMerge(base, overlay, ctx) {
     const result = { ...base };
     for (const [key, overlayValue] of Object.entries(overlay)) {
         // Skip directive keys in output
-        if (key.startsWith("$"))
+        if (XFG_DIRECTIVES.has(key))
             continue;
         const baseValue = base[key];
         // Per-field $arrayMerge + $values directive
@@ -66,14 +72,15 @@ export function deepMerge(base, overlay, ctx) {
     return result;
 }
 /**
- * Strip merge directive keys ($arrayMerge, $override, etc.) from an object.
+ * Strip xfg merge directive keys ($arrayMerge, $values) from an object.
  * Works recursively on nested objects and arrays.
+ * Standard $-prefixed keys ($schema, $id, $ref, etc.) are preserved.
  */
 export function stripMergeDirectives(obj) {
     const result = {};
     for (const [key, value] of Object.entries(obj)) {
-        // Skip all $-prefixed keys (reserved for directives)
-        if (key.startsWith("$"))
+        // Skip xfg directive keys only
+        if (XFG_DIRECTIVES.has(key))
             continue;
         if (isPlainObject(value)) {
             result[key] = stripMergeDirectives(value);

package/dist/sync/diff-utils.d.ts

@@ -7,9 +7,9 @@ export declare function getFileStatus(exists: boolean, changed: boolean): FileSt
  */
 export declare function formatDiffLine(line: string): string;
 /**
- * Check if a file is a structured data file (JSON, JSON5, YAML, YML).
+ * Check if a file is likely binary based on its extension.
  */
-export declare function isStructuredDataFile(fileName: string): boolean;
+export declare function isBinaryFile(fileName: string): boolean;
 /**
  * Compute a unified diff between old and new content.
  * Returns raw diff lines (no ANSI formatting).

package/dist/sync/diff-utils.js

@@ -17,11 +17,52 @@ export function formatDiffLine(line) {
         return chalk.cyan(line);
     return line;
 }
+const BINARY_EXTENSIONS = new Set([
+    ".png",
+    ".jpg",
+    ".jpeg",
+    ".gif",
+    ".bmp",
+    ".ico",
+    ".webp",
+    ".svg",
+    ".woff",
+    ".woff2",
+    ".ttf",
+    ".eot",
+    ".otf",
+    ".pdf",
+    ".zip",
+    ".tar",
+    ".gz",
+    ".bz2",
+    ".7z",
+    ".rar",
+    ".exe",
+    ".dll",
+    ".so",
+    ".dylib",
+    ".bin",
+    ".dat",
+    ".db",
+    ".sqlite",
+    ".jar",
+    ".class",
+    ".pyc",
+    ".wasm",
+    ".mp3",
+    ".mp4",
+    ".wav",
+    ".avi",
+    ".mov",
+    ".mkv",
+]);
 /**
- * Check if a file is a structured data file (JSON, JSON5, YAML, YML).
+ * Check if a file is likely binary based on its extension.
  */
-export function isStructuredDataFile(fileName) {
-    return /\.(json|json5|ya?ml)$/i.test(fileName);
+export function isBinaryFile(fileName) {
+    const ext = fileName.slice(fileName.lastIndexOf(".")).toLowerCase();
+    return BINARY_EXTENSIONS.has(ext);
 }
 /**
  * Compute a unified diff between old and new content.

package/dist/sync/file-writer.js

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { convertContentToString } from "../config/formatter.js";
 import { interpolateXfgContent } from "../shared/xfg-template.js";
-import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, computeUnifiedDiff, isStructuredDataFile, } from "./diff-utils.js";
+import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, computeUnifiedDiff, isBinaryFile, } from "./diff-utils.js";
 /**
  * Determines if a file should be marked as executable.
  * .sh files are auto-executable unless explicit executable: false is set.
@@ -70,8 +70,8 @@ export class FileWriter {
                     content: fileContent,
                     action,
                 };
-                // Compute raw diff lines for structured data files (all modes)
-                if (isStructuredDataFile(file.fileName)) {
+                // Compute raw diff lines for text files (all modes)
+                if (!isBinaryFile(file.fileName)) {
                     writeResult.diffLines = computeUnifiedDiff(existingContent, fileContent);
                 }
                 fileChanges.set(file.fileName, writeResult);

package/dist/sync/index.d.ts

@@ -1,4 +1,4 @@
 export type { DiffStats } from "./diff-utils.js";
-export { computeUnifiedDiff, isStructuredDataFile, formatDiffLine, } from "./diff-utils.js";
+export { computeUnifiedDiff, isBinaryFile, formatDiffLine, } from "./diff-utils.js";
 export type { FileChangeDetail, GitOpsFactory, IAuthOptionsBuilder, IBranchManager, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, IRepositoryProcessor, IRepositorySession, IWorkStrategy, ProcessorResult, SessionContext, WorkResult, } from "./types.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/index.js

@@ -1,2 +1,2 @@
-export { computeUnifiedDiff, isStructuredDataFile, formatDiffLine, } from "./diff-utils.js";
+export { computeUnifiedDiff, isBinaryFile, formatDiffLine, } from "./diff-utils.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/manifest-manager.js

@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { loadManifest, saveManifest, updateManifest, MANIFEST_FILENAME, } from "./manifest.js";
-import { computeUnifiedDiff, isStructuredDataFile } from "./diff-utils.js";
+import { computeUnifiedDiff, isBinaryFile } from "./diff-utils.js";
 /**
  * Handles manifest loading, saving, and orphan detection.
  */
@@ -35,7 +35,7 @@ export class ManifestManager {
                 content: null,
                 action: "delete",
             };
-            if (isStructuredDataFile(fileName)) {
+            if (!isBinaryFile(fileName)) {
                 const existingContent = gitOps.getFileContent(fileName);
                 if (existingContent !== null) {
                     writeResult.diffLines = computeUnifiedDiff(existingContent, null);

package/package.json

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