@malevich-studio/strapi-sdk-typescript 1.2.28 → 1.2.30

package/dist/cli.cjs

@@ -21425,7 +21425,9 @@ class Strapi {
         const response = await fetch(`${this.url}/api/${endpoint}`, mergedParams);
         let data = null;
         try {
-            data = await response?.clone().json() || null;
+            if (response.status !== 204) {
+                data = await response?.clone().json() || null;
+            }
         }
         catch (error) {
             console.error(await response.text());
@@ -21436,9 +21438,17 @@ class Strapi {
         log(data);
         return data;
     }
-    mergePermissionsPreferChild(parentPermissions, childPermissions) {
-        // Child permissions should override parent on conflicts; missing entries inherit from parent
-        return _.merge({}, parentPermissions, childPermissions);
+    mergePermissionsPreferEnabled(parentPermissions, childPermissions) {
+        // Merge permissions so that any action enabled in either source remains enabled in the result
+        const customizer = (objValue, srcValue, key) => {
+            if (key === 'enabled') {
+                const a = typeof objValue === 'boolean' ? objValue : false;
+                const b = typeof srcValue === 'boolean' ? srcValue : false;
+                return a || b;
+            }
+            return undefined; // fall back to default merge behavior
+        };
+        return _.mergeWith({}, parentPermissions, childPermissions, customizer);
     }
     async fetchRolePermissions(roleId) {
         const response = await this.fetchData(`users-permissions/roles/${roleId}`);
@@ -21452,7 +21462,7 @@ class Strapi {
         let currentParentId = initialParentId;
         while (currentParentId) {
             const { permissions: parentPermissions, parentId } = await this.fetchRolePermissions(currentParentId);
-            accumulatedPermissions = this.mergePermissionsPreferChild(parentPermissions, accumulatedPermissions);
+            accumulatedPermissions = this.mergePermissionsPreferEnabled(parentPermissions, accumulatedPermissions);
             currentParentId = parentId;
         }
         return accumulatedPermissions;