@strapi/utils 5.0.0-beta.6 → 5.0.0-beta.7

package/dist/index.mjs

@@ -283,6 +283,15 @@ const isVisibleAttribute = (model, attributeName) => {
 const getOptions = (model) => ___default.assign({ draftAndPublish: false }, ___default.get(model, "options", {}));
 const hasDraftAndPublish = (model) => ___default.get(model, "options.draftAndPublish", false) === true;
 const isDraft = (data, model) => hasDraftAndPublish(model) && ___default.get(data, PUBLISHED_AT_ATTRIBUTE$1) === null;
+const isSchema = (data) => {
+  return typeof data === "object" && data !== null && "modelType" in data && typeof data.modelType === "string" && ["component", "contentType"].includes(data.modelType);
+};
+const isComponentSchema = (data) => {
+  return isSchema(data) && data.modelType === "component";
+};
+const isContentTypeSchema = (data) => {
+  return isSchema(data) && data.modelType === "contentType";
+};
 const isSingleType = ({ kind = COLLECTION_TYPE }) => kind === SINGLE_TYPE;
 const isCollectionType = ({ kind = COLLECTION_TYPE }) => kind === COLLECTION_TYPE;
 const isKind = (kind) => (model) => model.kind === kind;
@@ -303,14 +312,16 @@ const isPrivateAttribute = (model, attributeName) => {
   return getStoredPrivateAttributes(model).includes(attributeName);
 };
 const isScalarAttribute = (attribute) => {
-  return !["media", "component", "relation", "dynamiczone"].includes(attribute?.type);
+  return attribute && !["media", "component", "relation", "dynamiczone"].includes(attribute.type);
 };
 const isMediaAttribute = (attribute) => attribute?.type === "media";
 const isRelationalAttribute = (attribute) => attribute?.type === "relation";
+const HAS_RELATION_REORDERING = ["manyToMany", "manyToOne", "oneToMany"];
+const hasRelationReordering = (attribute) => isRelationalAttribute(attribute) && HAS_RELATION_REORDERING.includes(attribute.relation);
 const isComponentAttribute = (attribute) => ["component", "dynamiczone"].includes(attribute?.type);
-const isDynamicZoneAttribute = (attribute) => attribute?.type === "dynamiczone";
+const isDynamicZoneAttribute = (attribute) => !!attribute && attribute.type === "dynamiczone";
 const isMorphToRelationalAttribute = (attribute) => {
-  return isRelationalAttribute(attribute) && attribute?.relation?.startsWith?.("morphTo");
+  return !!attribute && isRelationalAttribute(attribute) && attribute.relation?.startsWith?.("morphTo");
 };
 const getComponentAttributes = (schema) => {
   return ___default.reduce(
@@ -367,8 +378,11 @@ const contentTypes = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   getVisibleAttributes,
   getWritableAttributes,
   hasDraftAndPublish,
+  hasRelationReordering,
   isCollectionType,
   isComponentAttribute,
+  isComponentSchema,
+  isContentTypeSchema,
   isDraft,
   isDynamicZoneAttribute,
   isKind,
@@ -377,6 +391,7 @@ const contentTypes = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   isPrivateAttribute,
   isRelationalAttribute,
   isScalarAttribute,
+  isSchema,
   isSingleType,
   isTypedAttribute,
   isVisibleAttribute,
@@ -531,28 +546,29 @@ const providerFactory = (options = {}) => {
 };
 const traverseEntity = async (visitor2, options, entity) => {
   const { path = { raw: null, attribute: null }, schema, getModel } = options;
+  let parent = options.parent;
   const traverseMorphRelationTarget = async (visitor22, path2, entry) => {
     const targetSchema = getModel(entry.__type);
-    const traverseOptions = { schema: targetSchema, path: path2, getModel };
+    const traverseOptions = { schema: targetSchema, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const traverseRelationTarget = (schema2) => async (visitor22, path2, entry) => {
-    const traverseOptions = { schema: schema2, path: path2, getModel };
+    const traverseOptions = { schema: schema2, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const traverseMediaTarget = async (visitor22, path2, entry) => {
     const targetSchemaUID = "plugin::upload.file";
     const targetSchema = getModel(targetSchemaUID);
-    const traverseOptions = { schema: targetSchema, path: path2, getModel };
+    const traverseOptions = { schema: targetSchema, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const traverseComponent = async (visitor22, path2, schema2, entry) => {
-    const traverseOptions = { schema: schema2, path: path2, getModel };
+    const traverseOptions = { schema: schema2, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   const visitDynamicZoneEntry = async (visitor22, path2, entry) => {
     const targetSchema = getModel(entry.__component);
-    const traverseOptions = { schema: targetSchema, path: path2, getModel };
+    const traverseOptions = { schema: targetSchema, path: path2, getModel, parent };
     return traverseEntity(visitor22, traverseOptions, entry);
   };
   if (!isObject(entity) || isNil(schema)) {
@@ -564,9 +580,6 @@ const traverseEntity = async (visitor2, options, entity) => {
   for (let i = 0; i < keys.length; i += 1) {
     const key = keys[i];
     const attribute = schema.attributes[key];
-    if (isNil(attribute)) {
-      continue;
-    }
     const newPath = { ...path };
     newPath.raw = isNil(path.raw) ? key : `${path.raw}.${key}`;
     if (!isNil(attribute)) {
@@ -579,13 +592,15 @@ const traverseEntity = async (visitor2, options, entity) => {
       value: copy[key],
       attribute,
       path: newPath,
-      getModel
+      getModel,
+      parent
     };
     await visitor2(visitorOptions, visitorUtils);
     const value = copy[key];
-    if (isNil(value)) {
+    if (isNil(value) || isNil(attribute)) {
       continue;
     }
+    parent = { schema, key, attribute, path: newPath };
     if (isRelationalAttribute(attribute)) {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
       const method = isMorphRelation ? traverseMorphRelationTarget : traverseRelationTarget(getModel(attribute.target));
@@ -2153,13 +2168,16 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   sanitizers,
   visitors: index$4
 }, Symbol.toStringTag, { value: "Module" }));
-const throwInvalidParam = ({ key, path }) => {
-  const msg = path && path !== key ? `Invalid parameter ${key} at ${path}` : `Invalid parameter ${key}`;
-  throw new ValidationError(msg);
+const throwInvalidKey = ({ key, path }) => {
+  const msg = path && path !== key ? `Invalid key ${key} at ${path}` : `Invalid key ${key}`;
+  throw new ValidationError(msg, {
+    key,
+    path
+  });
 };
 const visitor$3 = ({ key, attribute, path }) => {
   if (attribute?.type === "password") {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const visitor$2 = ({ schema, key, attribute, path }) => {
@@ -2168,7 +2186,7 @@ const visitor$2 = ({ schema, key, attribute, path }) => {
   }
   const isPrivate = attribute.private === true || isPrivateAttribute(schema, key);
   if (isPrivate) {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const ACTIONS_TO_VERIFY = ["find"];
@@ -2186,7 +2204,7 @@ const throwRestrictedRelations = (auth) => async ({ data, key, attribute, schema
       const scopes = ACTIONS_TO_VERIFY.map((action) => `${element.__type}.${action}`);
       const isAllowed = await hasAccessToSomeScopes(scopes, auth);
       if (!isAllowed) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }
   };
@@ -2194,7 +2212,7 @@ const throwRestrictedRelations = (auth) => async ({ data, key, attribute, schema
     const scopes = ACTIONS_TO_VERIFY.map((action) => `${attribute.target}.${action}`);
     const isAllowed = await hasAccessToSomeScopes(scopes, auth);
     if (!isAllowed) {
-      throwInvalidParam({ key, path: path.attribute });
+      throwInvalidKey({ key, path: path.attribute });
     }
   };
   const isCreatorRelation = [CREATED_BY_ATTRIBUTE, UPDATED_BY_ATTRIBUTE].includes(key);
@@ -2220,12 +2238,12 @@ const hasAccessToSomeScopes = async (scopes, auth) => {
 };
 const visitor$1 = ({ key, attribute, path }) => {
   if (isMorphToRelationalAttribute(attribute)) {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const visitor = ({ key, attribute, path }) => {
   if (isDynamicZoneAttribute(attribute)) {
-    throwInvalidParam({ key, path: path.attribute });
+    throwInvalidKey({ key, path: path.attribute });
   }
 };
 const throwDisallowedFields = (allowedFields = null) => ({ key, path: { attribute: path } }) => {
@@ -2247,7 +2265,7 @@ const throwDisallowedFields = (allowedFields = null) => ({ key, path: { attribut
   if (isPathAllowed) {
     return;
   }
-  throwInvalidParam({ key, path });
+  throwInvalidKey({ key, path });
 };
 const getContainedPaths = (path) => {
   const parts = toPath(path);
@@ -2257,7 +2275,7 @@ const getContainedPaths = (path) => {
 };
 const throwRestrictedFields = (restrictedFields = null) => ({ key, path: { attribute: path } }) => {
   if (restrictedFields === null) {
-    throwInvalidParam({ key, path });
+    throwInvalidKey({ key, path });
   }
   if (!(isArray(restrictedFields) && restrictedFields.every(isString))) {
     throw new TypeError(
@@ -2265,15 +2283,45 @@ const throwRestrictedFields = (restrictedFields = null) => ({ key, path: { attri
     );
   }
   if (restrictedFields.includes(path)) {
-    throwInvalidParam({ key, path });
+    throwInvalidKey({ key, path });
   }
   const isRestrictedNested = restrictedFields.some(
     (allowedPath) => path?.toString().startsWith(`${allowedPath}.`)
   );
   if (isRestrictedNested) {
-    throwInvalidParam({ key, path });
+    throwInvalidKey({ key, path });
   }
 };
+const ID_FIELDS = [constants$1.DOC_ID_ATTRIBUTE, constants$1.DOC_ID_ATTRIBUTE];
+const ALLOWED_ROOT_LEVEL_FIELDS = [...ID_FIELDS];
+const MORPH_TO_ALLOWED_FIELDS = ["__type"];
+const DYNAMIC_ZONE_ALLOWED_FIELDS = ["__component"];
+const RELATION_REORDERING_FIELDS = ["connect", "disconnect", "set", "options"];
+const throwUnrecognizedFields = ({ key, attribute, path, schema, parent }) => {
+  if (attribute) {
+    return;
+  }
+  if (path.attribute === null) {
+    if (ALLOWED_ROOT_LEVEL_FIELDS.includes(key)) {
+      return;
+    }
+    return throwInvalidKey({ key, path: attribute });
+  }
+  if (isMorphToRelationalAttribute(parent?.attribute) && MORPH_TO_ALLOWED_FIELDS.includes(key)) {
+    return;
+  }
+  if (isComponentSchema(schema) && isDynamicZoneAttribute(parent?.attribute) && DYNAMIC_ZONE_ALLOWED_FIELDS.includes(key)) {
+    return;
+  }
+  if (hasRelationReordering(parent?.attribute) && RELATION_REORDERING_FIELDS.includes(key)) {
+    return;
+  }
+  const canUseID = isRelationalAttribute(parent?.attribute) || isMediaAttribute(parent?.attribute);
+  if (canUseID && !ID_FIELDS.includes(key)) {
+    return;
+  }
+  throwInvalidKey({ key, path: attribute });
+};
 const index$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   throwDisallowedFields,
@@ -2282,7 +2330,8 @@ const index$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   throwPassword: visitor$3,
   throwPrivate: visitor$2,
   throwRestrictedFields,
-  throwRestrictedRelations
+  throwRestrictedRelations,
+  throwUnrecognizedFields
 }, Symbol.toStringTag, { value: "Module" }));
 const { ID_ATTRIBUTE: ID_ATTRIBUTE$1, DOC_ID_ATTRIBUTE: DOC_ID_ATTRIBUTE$1 } = constants$1;
 const throwPasswords = (ctx) => async (entity) => {
@@ -2303,7 +2352,7 @@ const defaultValidateFilters = curry((ctx, filters2) => {
       }
       const isAttribute = !!attribute;
       if (!isAttribute && !isOperator(key)) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx),
     // dynamic zones from filters
@@ -2328,7 +2377,7 @@ const defaultValidateSort = curry((ctx, sort2) => {
         return;
       }
       if (!attribute) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx),
     // dynamic zones from sort
@@ -2345,7 +2394,7 @@ const defaultValidateSort = curry((ctx, sort2) => {
         return;
       }
       if (!isScalarAttribute(attribute) && isEmpty(value)) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx)
   )(sort2);
@@ -2361,7 +2410,7 @@ const defaultValidateFields = curry((ctx, fields2) => {
         return;
       }
       if (isNil(attribute) || !isScalarAttribute(attribute)) {
-        throwInvalidParam({ key, path: path.attribute });
+        throwInvalidKey({ key, path: path.attribute });
       }
     }, ctx),
     // private fields
@@ -2456,15 +2505,18 @@ const createAPIValidators = (opts) => {
       (data2) => {
         if (isObject(data2)) {
           if (ID_ATTRIBUTE in data2) {
-            throwInvalidParam({ key: ID_ATTRIBUTE });
+            throwInvalidKey({ key: ID_ATTRIBUTE });
           }
           if (DOC_ID_ATTRIBUTE in data2) {
-            throwInvalidParam({ key: DOC_ID_ATTRIBUTE });
+            throwInvalidKey({ key: DOC_ID_ATTRIBUTE });
           }
         }
+        return data2;
       },
       // non-writable attributes
-      traverseEntity$1(throwRestrictedFields(nonWritableAttributes), { schema, getModel })
+      traverseEntity$1(throwRestrictedFields(nonWritableAttributes), { schema, getModel }),
+      // unrecognized attributes
+      traverseEntity$1(throwUnrecognizedFields, { schema, getModel })
     ];
     if (auth) {
       transforms.push(
@@ -2475,7 +2527,14 @@ const createAPIValidators = (opts) => {
       );
     }
     opts?.validators?.input?.forEach((validator) => transforms.push(validator(schema)));
-    await pipe(...transforms)(data);
+    try {
+      await pipe(...transforms)(data);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "body";
+      }
+      throw e;
+    }
   };
   const validateQuery = async (query, schema, { auth } = {}) => {
     if (!schema) {
@@ -2512,7 +2571,15 @@ const createAPIValidators = (opts) => {
         })
       );
     }
-    await pipe(...transforms)(filters2);
+    try {
+      await pipe(...transforms)(filters2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "filters";
+      }
+      throw e;
+    }
   };
   const validateSort = async (sort2, schema, { auth } = {}) => {
     if (!schema) {
@@ -2527,14 +2594,30 @@ const createAPIValidators = (opts) => {
         })
       );
     }
-    await pipe(...transforms)(sort2);
+    try {
+      await pipe(...transforms)(sort2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "sort";
+      }
+      throw e;
+    }
   };
   const validateFields = async (fields2, schema) => {
     if (!schema) {
       throw new Error("Missing schema in validateFields");
     }
     const transforms = [defaultValidateFields({ schema, getModel })];
-    await pipe(...transforms)(fields2);
+    try {
+      await pipe(...transforms)(fields2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "fields";
+      }
+      throw e;
+    }
   };
   const validatePopulate = async (populate2, schema, { auth } = {}) => {
     if (!schema) {
@@ -2549,7 +2632,15 @@ const createAPIValidators = (opts) => {
         })
       );
     }
-    await pipe(...transforms)(populate2);
+    try {
+      await pipe(...transforms)(populate2);
+    } catch (e) {
+      if (e instanceof ValidationError) {
+        e.details.source = "query";
+        e.details.param = "populate";
+      }
+      throw e;
+    }
   };
   return {
     input: validateInput,
@@ -2633,8 +2724,57 @@ const withDefaultPagination = (args, { defaults: defaults2 = {}, maxLimit = -1 }
   );
   return replacePaginationAttributes(args);
 };
+const transformPagedPaginationInfo = (paginationInfo, total) => {
+  if (!isNil(paginationInfo.page)) {
+    const page = paginationInfo.page;
+    const pageSize = paginationInfo.pageSize ?? total;
+    return {
+      page,
+      pageSize,
+      pageCount: pageSize > 0 ? Math.ceil(total / pageSize) : 0,
+      total
+    };
+  }
+  if (!isNil(paginationInfo.start)) {
+    const start = paginationInfo.start;
+    const limit = paginationInfo.limit ?? total;
+    return {
+      page: Math.floor(start / limit) + 1,
+      pageSize: limit,
+      pageCount: limit > 0 ? Math.ceil(total / limit) : 0,
+      total
+    };
+  }
+  return {
+    ...paginationInfo,
+    page: 1,
+    pageSize: 10,
+    pageCount: 1,
+    total
+  };
+};
+const transformOffsetPaginationInfo = (paginationInfo, total) => {
+  if (!isNil(paginationInfo.page)) {
+    const limit = paginationInfo.pageSize ?? total;
+    const start = (paginationInfo.page - 1) * limit;
+    return { start, limit, total };
+  }
+  if (!isNil(paginationInfo.start)) {
+    const start = paginationInfo.start;
+    const limit = paginationInfo.limit ?? total;
+    return { start, limit, total };
+  }
+  return {
+    ...paginationInfo,
+    start: 0,
+    limit: 10,
+    total
+  };
+};
 const pagination = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
+  transformOffsetPaginationInfo,
+  transformPagedPaginationInfo,
   withDefaultPagination
 }, Symbol.toStringTag, { value: "Module" }));
 const SUPPORTED_PACKAGE_MANAGERS = ["npm", "yarn"];