@adobe/helix-config 5.4.2 → 5.4.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.4.4](https://github.com/adobe/helix-config/compare/v5.4.3...v5.4.4) (2025-05-28)
+
+
+### Bug Fixes
+
+* properly merge org config access ([#281](https://github.com/adobe/helix-config/issues/281)) ([2c6f49a](https://github.com/adobe/helix-config/commit/2c6f49a27e837c407686a35f5b701fdfdc86d4f8))
+
+## [5.4.3](https://github.com/adobe/helix-config/compare/v5.4.2...v5.4.3) (2025-05-23)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-config to v11.1.6 ([#279](https://github.com/adobe/helix-config/issues/279)) ([44159b7](https://github.com/adobe/helix-config/commit/44159b78c3c74d5e1da1ea2710bad087046bb30b))
+
 ## [5.4.2](https://github.com/adobe/helix-config/compare/v5.4.1...v5.4.2) (2025-05-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.4.2",
+  "version": "5.4.4",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -44,11 +44,11 @@
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
     "lint-staged": "16.0.0",
-    "mocha": "11.4.0",
+    "mocha": "11.5.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
     "nock": "13.5.6",
-    "semantic-release": "24.2.4"
+    "semantic-release": "24.2.5"
   },
   "lint-staged": {
     "*.js": "eslint",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@adobe/fetch": "4.2.2",
-    "@adobe/helix-shared-config": "11.1.5",
+    "@adobe/helix-shared-config": "11.1.6",
     "@adobe/helix-shared-utils": "3.0.2"
   }
 }

package/src/config-view.js

@@ -20,7 +20,7 @@ import {
   SCOPE_RAW, SCOPE_PUBLIC,
 } from './ConfigContext.js';
 import { resolveLegacyConfig, fetchRobotsTxt, toArray } from './config-legacy.js';
-import { deepGetOrCreate } from './utils.js';
+import { deepGetOrCreate, prune } from './utils.js';
 import { ConfigObject } from './config-object.js';
 
 /**
@@ -160,7 +160,7 @@ function resolveSecret(object, idProp, dstProp, siteConfig, orgConfig) {
  * Returns the normalized access configuration for the give partition.
  */
 export async function getAccessConfig(ctx, config, orgConfig, partition, rso) {
-  const { access } = config;
+  const { access = {} } = config;
   const pAccess = access[partition] ?? {};
   const secretId = toArray(
     pAccess.apiKeyId ?? pAccess.secretId ?? access.site?.apiKeyId ?? access.site?.secretId,
@@ -497,9 +497,9 @@ export async function getConfigResponse(ctx, opts) {
   }
 
   const orgConfig = await loadOrgConfig(ctx, org);
-  if (config.access) {
+  if (config.access || orgConfig?.access) {
     // normalize access config
-    const { admin = {} } = config.access;
+    const { admin = {} } = config.access ?? {};
     config.access = {
       preview: await getAccessConfig(ctx, config, orgConfig, 'preview', rso),
       live: await getAccessConfig(ctx, config, orgConfig, 'live', rso),
@@ -509,6 +509,10 @@ export async function getConfigResponse(ctx, opts) {
       // eslint-disable-next-line max-len
       config.access.admin = computeSiteAdminRoles(admin, orgConfig, config.groups);
     }
+    prune(config.access);
+    if (!Object.keys(config.access).length) {
+      delete config.access;
+    }
   }
   if (opts.scope === SCOPE_ADMIN || opts.scope === SCOPE_RAW) {
     const merged = { ...config.apiKeys, ...orgConfig?.apiKeys };

package/src/utils.js

@@ -39,3 +39,24 @@ export function deepGetOrCreate(obj, path, create = false) {
   }
   return o;
 }
+
+export function prune(obj, path = '') {
+  for (const key of Object.keys(obj)) {
+    const itemPath = `${path}.${key}`;
+    const prop = obj[key];
+    if (Array.isArray(prop)) {
+      // only prune empty arrays; not recursive
+      if (prop.length === 0) {
+        // eslint-disable-next-line no-param-reassign
+        delete obj[key];
+      }
+    } else if (typeof prop === 'object') {
+      prune(prop, itemPath);
+      if (Object.keys(prop).length === 0) {
+        // eslint-disable-next-line no-param-reassign
+        delete obj[key];
+      }
+    }
+  }
+  return obj;
+}