@strapi/utils 5.0.0-beta.8 → 5.0.0-beta.9

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import * as _ from "lodash";
 import ___default, { kebabCase } from "lodash";
 import * as dates$1 from "date-fns";
-import { has, union, getOr, assoc, assign, cloneDeep, remove, eq, curry, isObject, isNil, clone, isArray, isEmpty, toPath, defaults, isString, mergeAll, get, toNumber, isInteger, pick, omit, trim, pipe as pipe$1, split, map as map$1, flatten, first, identity, constant, join, merge, trimChars, trimCharsEnd, trimCharsStart, isNumber } from "lodash/fp";
+import { has, union, getOr, assoc, assign, cloneDeep, remove, eq, curry, isObject, isNil, clone, isArray, isEmpty, toPath, defaults, isString, get, toNumber, isInteger, pick, omit, trim, pipe as pipe$1, split, map as map$1, flatten, first, identity, constant, join, merge, trimChars, trimCharsEnd, trimCharsStart, isNumber } from "lodash/fp";
 import { randomUUID } from "crypto";
 import { machineIdSync } from "node-machine-id";
 import * as yup$1 from "yup";
@@ -1024,27 +1024,45 @@ const createTransformer = ({ getModel }) => {
     }
     throw new InvalidPopulateError();
   };
-  const hasFragmentPopulateDefined = (populate2) => {
+  const hasPopulateFragmentDefined = (populate2) => {
     return typeof populate2 === "object" && "on" in populate2 && !isNil(populate2.on);
   };
+  const hasCountDefined = (populate2) => {
+    return typeof populate2 === "object" && "count" in populate2 && typeof populate2.count === "boolean";
+  };
   const convertPopulateObject = (populate2, schema) => {
     if (!schema) {
       return {};
     }
     const { attributes } = schema;
     return Object.entries(populate2).reduce((acc, [key, subPopulate]) => {
+      if (___default.isString(subPopulate)) {
+        try {
+          const subPopulateAsBoolean = parseType({ type: "boolean", value: subPopulate });
+          return subPopulateAsBoolean === true ? { ...acc, [key]: true } : acc;
+        } catch {
+        }
+      }
       if (___default.isBoolean(subPopulate)) {
-        return { ...acc, [key]: subPopulate };
+        return subPopulate === true ? { ...acc, [key]: true } : acc;
       }
       const attribute = attributes[key];
       if (!attribute) {
         return acc;
       }
-      const isAllowedAttributeForFragmentPopulate = isDynamicZoneAttribute(attribute) || isMorphToRelationalAttribute(attribute);
-      if (isAllowedAttributeForFragmentPopulate && hasFragmentPopulateDefined(subPopulate)) {
-        return {
-          ...acc,
-          [key]: {
+      const isMorphLikeRelationalAttribute = isDynamicZoneAttribute(attribute) || isMorphToRelationalAttribute(attribute);
+      if (isMorphLikeRelationalAttribute) {
+        const hasInvalidProperties = Object.keys(subPopulate).some(
+          (key2) => !["on", "count"].includes(key2)
+        );
+        if (hasInvalidProperties) {
+          throw new Error(
+            `Invalid nested populate for ${schema.info?.singularName}.${key} (${schema.uid}). Expected a fragment ("on") or "count" but found ${JSON.stringify(subPopulate)}`
+          );
+        }
+        const newSubPopulate = {};
+        if (hasPopulateFragmentDefined(subPopulate)) {
+          Object.assign(newSubPopulate, {
             on: Object.entries(subPopulate.on).reduce(
               (acc2, [type, typeSubPopulate]) => ({
                 ...acc2,
@@ -1052,21 +1070,15 @@ const createTransformer = ({ getModel }) => {
               }),
               {}
             )
-          }
-        };
-      }
-      if (isDynamicZoneAttribute(attribute)) {
-        const populates = attribute.components.map((uid) => getModel(uid)).map((schema2) => convertNestedPopulate(subPopulate, schema2)).map((populate22) => populate22 === true ? {} : populate22).filter((populate22) => populate22 !== false);
-        if (isEmpty(populates)) {
-          return acc;
+          });
+        }
+        if (hasCountDefined(subPopulate)) {
+          Object.assign(newSubPopulate, { count: subPopulate.count });
         }
-        return {
-          ...acc,
-          [key]: mergeAll(populates)
-        };
+        return { ...acc, [key]: newSubPopulate };
       }
-      if (isMorphToRelationalAttribute(attribute)) {
-        return { ...acc, [key]: convertNestedPopulate(subPopulate, void 0) };
+      if (!isMorphLikeRelationalAttribute && hasPopulateFragmentDefined(subPopulate)) {
+        throw new Error(`Using fragments is not permitted to populate "${key}" in "${schema.uid}"`);
       }
       let targetSchemaUID;
       if (attribute.type === "relation") {
@@ -1822,7 +1834,8 @@ const populate = traverseFactory().intercept(isStringArray$1, async (visitor2, o
         return;
       }
       const newValue2 = await recurse(visitor2, { schema, path, getModel }, { on: value?.on });
-      set(key, { on: newValue2 });
+      set(key, newValue2);
+      return;
     }
     const targetSchemaUID = attribute.target;
     const targetSchema = getModel(targetSchemaUID);
@@ -1844,36 +1857,15 @@ const populate = traverseFactory().intercept(isStringArray$1, async (visitor2, o
   const targetSchema = getModel(attribute.component);
   const newValue = await recurse(visitor2, { schema: targetSchema, path, getModel }, value);
   set(key, newValue);
-}).onDynamicZone(
-  async ({ key, value, attribute, schema, visitor: visitor2, path, getModel }, { set, recurse }) => {
-    if (isNil(value)) {
-      return;
-    }
-    if (isObject(value)) {
-      const { components } = attribute;
-      const newValue = {};
-      let newProperties = omit("on", value);
-      for (const componentUID of components) {
-        const componentSchema = getModel(componentUID);
-        const properties = await recurse(
-          visitor2,
-          { schema: componentSchema, path, getModel },
-          value
-        );
-        newProperties = merge(newProperties, properties);
-      }
-      Object.assign(newValue, newProperties);
-      if ("on" in value && value.on) {
-        const newOn = await recurse(visitor2, { schema, path, getModel }, { on: value.on });
-        Object.assign(newValue, newOn);
-      }
-      set(key, newValue);
-    } else {
-      const newValue = await recurse(visitor2, { schema, path, getModel }, value);
-      set(key, newValue);
-    }
+}).onDynamicZone(async ({ key, value, schema, visitor: visitor2, path, getModel }, { set, recurse }) => {
+  if (isNil(value) || !isObject(value)) {
+    return;
   }
-);
+  if ("on" in value && value.on) {
+    const newOn = await recurse(visitor2, { schema, path, getModel }, { on: value.on });
+    set(key, newOn);
+  }
+});
 const traverseQueryPopulate = curry(populate.traverse);
 const isStringArray = (value) => isArray(value) && value.every(isString);
 const fields = traverseFactory().intercept(isStringArray, async (visitor2, options, fields2, { recurse }) => {