domma-cms 0.22.6 → 0.24.0

package/bin/lib/config-merge.js

@@ -1,44 +1,44 @@
-/**
- * Domma CMS — Config Merge Utility
- * Merges new keys from an upstream config into an existing user config,
- * without ever overwriting values the user already has.
- */
-
-/**
- * Deep-merge new keys from `upstream` into `existing`.
- * Existing values are never modified — only missing keys are added.
- *
- * @param {object} existing - The user's current config object
- * @param {object} upstream - The upstream (new version) config object
- * @param {string} [_prefix] - Internal: key path prefix for reporting
- * @returns {{ merged: object, added: string[] }} Merged object + list of added key paths
- */
-export function deepMergeNewKeys(existing, upstream, _prefix = '') {
-    const merged = {...existing};
-    const added = [];
-
-    for (const [key, upstreamVal] of Object.entries(upstream)) {
-        const fullKey = _prefix ? `${_prefix}.${key}` : key;
-
-        if (!(key in existing)) {
-            // Key is entirely missing — add it wholesale
-            merged[key] = upstreamVal;
-            added.push(fullKey);
-        } else if (
-            upstreamVal !== null &&
-            typeof upstreamVal === 'object' &&
-            !Array.isArray(upstreamVal) &&
-            typeof existing[key] === 'object' &&
-            existing[key] !== null &&
-            !Array.isArray(existing[key])
-        ) {
-            // Both sides are plain objects — recurse
-            const child = deepMergeNewKeys(existing[key], upstreamVal, fullKey);
-            merged[key] = child.merged;
-            added.push(...child.added);
-        }
-        // Otherwise: existing value wins — no action
-    }
-
-    return {merged, added};
-}
+/**
+ * Domma CMS — Config Merge Utility
+ * Merges new keys from an upstream config into an existing user config,
+ * without ever overwriting values the user already has.
+ */
+
+/**
+ * Deep-merge new keys from `upstream` into `existing`.
+ * Existing values are never modified — only missing keys are added.
+ *
+ * @param {object} existing - The user's current config object
+ * @param {object} upstream - The upstream (new version) config object
+ * @param {string} [_prefix] - Internal: key path prefix for reporting
+ * @returns {{ merged: object, added: string[] }} Merged object + list of added key paths
+ */
+export function deepMergeNewKeys(existing, upstream, _prefix = '') {
+    const merged = {...existing};
+    const added = [];
+
+    for (const [key, upstreamVal] of Object.entries(upstream)) {
+        const fullKey = _prefix ? `${_prefix}.${key}` : key;
+
+        if (!(key in existing)) {
+            // Key is entirely missing — add it wholesale
+            merged[key] = upstreamVal;
+            added.push(fullKey);
+        } else if (
+            upstreamVal !== null &&
+            typeof upstreamVal === 'object' &&
+            !Array.isArray(upstreamVal) &&
+            typeof existing[key] === 'object' &&
+            existing[key] !== null &&
+            !Array.isArray(existing[key])
+        ) {
+            // Both sides are plain objects — recurse
+            const child = deepMergeNewKeys(existing[key], upstreamVal, fullKey);
+            merged[key] = child.merged;
+            added.push(...child.added);
+        }
+        // Otherwise: existing value wins — no action
+    }
+
+    return {merged, added};
+}