@aspruyt/xfg 5.1.0 → 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/package.json

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